| 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.cc
|
| 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.cc
|
| 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.cc
|
| deac0c43a7683ce292e438d19a649b9772c88834 |
|
07-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r11.0.672.0: Compile fixes in pref_service.cc
Avoid including configuration_policy_pref_store.h as that
depends on autogenerated files (and is not needed).
That also meant we had to remove a using statement.
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/policy/configuration_policy_store_interface.h?view=diff&pathrev=74924&r1=72955&r2=72956
Two new arguments to the CTOR:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.h?view=diff&pathrev=74924&r1=72488&r2=72489
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.h?view=diff&pathrev=74924&r1=73865&r2=73866
New constructor added, made android modifications:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.cc?view=diff&pathrev=74924&r1=72488&r2=72489
Change-Id: I667a68039f4c78a740b99f7b1086943dfcd9ae65
/external/chromium/chrome/browser/prefs/pref_service.cc
|
| 61343de6d1505096778d1071006fdba451a937a6 |
|
06-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r11.0.672.0: Fix conflicts in pref_service.cc
Header move close to local edit:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.cc?view=diff&pathrev=74924&r1=72226&r2=72227
Renamed variable close to local edit:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.cc?view=diff&pathrev=74924&r1=73865&r2=73866
New function close to local edit:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.cc?view=diff&pathrev=74924&r1=72488&r2=72489
New function close to local edits:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.cc?view=diff&pathrev=74924&r1=72488&r2=72489
Change-Id: Idcad89f587b1e74310f92094d3622185e9c524aa
/external/chromium/chrome/browser/prefs/pref_service.cc
|
| 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.cc
|
| 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.cc
|
| 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.cc
|
| 4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7 |
|
25-Nov-2010 |
Ben Murdoch <benm@google.com> |
Merge Chromium at r66597: Initial merge by git.
Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
/external/chromium/chrome/browser/prefs/pref_service.cc
|
| 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.cc
|
| 0c1d1cdabd0d3bb762788ac04f9d6784c0b3f848 |
|
19-Oct-2010 |
Ben Murdoch <benm@google.com> |
Implement l10n_util functions needed for AutoFill previews.
Generating an autofill preview uses localisation strings to
work out how the preview should be formatted appropriate for
the current users locale. On Android, call through JNI and
look up the relevant string from the resources file.
Change-Id: I74158278757d88cfeab407c13e69e6f4cf138630
/external/chromium/chrome/browser/prefs/pref_service.cc
|
| 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.cc
|
| 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.cc
|