| cb7fae5ad30624a97df1fe8c72c8484de3e465dd |
|
06-Jul-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r12.0.742.93: Compile fixes, add virtual destructors
New classes with virtual functions, but not virtual destructors.
This does not compile on Android, so adding them.
Change-Id: Ic9497dd6f83b7f3bafbab708e15ffd6507e82390
/external/chromium/chrome/browser/prefs/pref_service.h
|
| ddb351dbec246cf1fab5ec20d2d5520909041de1 |
|
28-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r12.0.742.93: Initial merge by git
Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
/external/chromium/chrome/browser/prefs/pref_service.h
|
| dc0f95d653279beabeb9817299e2902918ba123e |
|
09-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r11.0.696.0: Initial merge by git
Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d
/external/chromium/chrome/browser/prefs/pref_service.h
|
| 1671993f5bbda2f18558145bee503edbebcdc5ca |
|
16-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Removing local changes from chrome/browser/prefs
After this we are matching upstream
Change-Id: Ifae1c3935157d49f95c271bf6a5e00b8ce434fe3
/external/chromium/chrome/browser/prefs/pref_service.h
|
| 47ac375301e695030d3c8c8a1cacc7d2ea54e89f |
|
02-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r11.0.672.0: Fix conflicts in pref_service.h
Upstream change close to local edit:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.h?r1=70351&r2=72489&pathrev=74924
Change-Id: Ie63b95f5e21893a79f764509a5020017c7da08e9
/external/chromium/chrome/browser/prefs/pref_service.h
|
| 72a454cd3513ac24fbdd0e0cb9ad70b86a99b801 |
|
31-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium.org at r11.0.672.0: Initial merge by git.
Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
/external/chromium/chrome/browser/prefs/pref_service.h
|
| 3f50c38dc070f4bb515c1b64450dae14f316474e |
|
24-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r10.0.634.0: Initial merge by git.
Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
/external/chromium/chrome/browser/prefs/pref_service.h
|
| b401d151b3ce4e803c0e71a2381d4a3735c3829f |
|
13-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at 10.0.621.0: Fix conflicts in pref_service.*
Large upstream changes close to local commits.
CL's that caused the conflict:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.cc?r1=68736&r2=70050
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.cc?r1=68355&r2=68574
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.cc?view=diff&r1=68735&r2=68736
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.cc?r1=68355&r2=68574
Change-Id: I7bc23c57ea81468f0ba95fb49c35d312c13e6bf8
/external/chromium/chrome/browser/prefs/pref_service.h
|
| 22bc5ef1ef72c95f7303adefaa5949e3ed4bef1a |
|
12-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at 10.0.621.0: Fix conflict in pref_service.h
Upstream changes close to local changes
CLs:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.h?view=diff&r1=68156&r2=68157
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.h?view=diff&r1=68573&r2=68574
Change-Id: I74a450afcb9de01317046493899553b94a654e47
/external/chromium/chrome/browser/prefs/pref_service.h
|
| 21d179b334e59e9a3bfcaed4c4430bef1bc5759d |
|
11-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at 10.0.621.0: Initial merge by git.
Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
/external/chromium/chrome/browser/prefs/pref_service.h
|
| 731df977c0511bca2206b5f333555b1205ff1f43 |
|
01-Nov-2010 |
Iain Merrick <husky@google.com> |
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
/external/chromium/chrome/browser/prefs/pref_service.h
|
| 2d4c389cec3afa34e36dcf7cdac6383e84f473af |
|
06-Oct-2010 |
Iain Merrick <husky@google.com> |
Merge Chromium at 7.0.540.0 : Fix chrome/browser/prefs
These files were edited in Android but moved in Chromium,
and git wasn't able to resolve all the changes. I've tried
to replicate the original Android code and avoid dragging
in any extra dependencies.
In PrefService, all calls to PrefNotifier are stripped out.
In PrefValueStore, all stores except the trivial DefaultPrefStore
are stripped out.
See http://src.chromium.org/viewvc/chrome?view=rev&revision=57434
Change-Id: I624498c9503e0bacf4ec9c0956af11ba89219139
/external/chromium/chrome/browser/prefs/pref_service.h
|
| 3345a6884c488ff3a535c2c9acdd33d74b37e311 |
|
19-Oct-2010 |
Iain Merrick <husky@google.com> |
Merge Chromium at 7.0.540.0 : Initial merge by git
Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.
Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
/external/chromium/chrome/browser/prefs/pref_service.h
|