| 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_value_store.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_value_store.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_value_store.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_value_store.h
|
| 5af4e3efaa07e1369024c188538dcf582ed5a21e |
|
13-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at 10.0.621.0: Fix conflicts in pref_value_store.*
Large upstream changes. Matching upstream now, with a local change
that will be upstreamed.
Mostly due to these CL's
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_value_store.h?r1=68355&r2=68574
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_value_store.h?r1=68736&r2=70050
Change-Id: I62bea1d4e4314b379ee823bb505412b049c8c17b
/external/chromium/chrome/browser/prefs/pref_value_store.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_value_store.h
|
| 201ade2fbba22bfb27ae029f4d23fca6ded109a0 |
|
07-Jan-2011 |
Ben Murdoch <benm@google.com> |
Merge chromium at 9.0.597.55: Initial merge by git.
Change-Id: Id686a88437441ec7e17abb3328a404c7b6c3c6ad
/external/chromium/chrome/browser/prefs/pref_value_store.h
|
| 62178e3990b32e9c89bb7d6f06605044b31adba2 |
|
26-Nov-2010 |
Ben Murdoch <benm@google.com> |
Merge Chromium at r66597: Fix conflicts.
build_config.h
http://src.chromium.org/viewvc/chrome?view=rev&revision=65920
pref_value_store.cc|h
http://src.chromium.org/viewvc/chrome?view=rev&revision=66426
personal_data_manager.cc
http://src.chromium.org/viewvc/chrome?view=rev&revision=65830
x509_certificate_openssl.cc
http://src.chromium.org/viewvc/chrome?view=rev&revision=66413
Change-Id: I2eab5c3e50a2fa4d79da023049681d36ca4bc0da
/external/chromium/chrome/browser/prefs/pref_value_store.h
|
| 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_value_store.h
|
| 2255f234e3edbf06b52de2ab4329d1564ef8efb0 |
|
01-Nov-2010 |
Iain Merrick <husky@google.com> |
Merge Chromium at r63472 : Fix conflicts.
SharedMemory added to stats_table.cc, duplicating Android change.
http://src.chromium.org/viewvc/chrome?view=rev&revision=62510
chrome/browser/guid.h added to chrome/browser/autofill:
http://src.chromium.org/viewvc/chrome?view=rev&revision=63173
chrome_thread.h renamed to browser_thread.h:
http://src.chromium.org/viewvc/chrome?view=rev&revision=62286
DnsRRResolverWorker substantially overhauled:
http://src.chromium.org/viewvc/chrome?view=rev&revision=61071
X509 certificates added for OpenSSL (replacing old Android hacks):
http://src.chromium.org/viewvc/chrome?view=rev&revision=61955
OpenSSL now available in Chrome (previously enabled for Android only):
http://src.chromium.org/viewvc/chrome?view=rev&revision=60936
Change-Id: I42e4fefcdabd996cb3c173dc412318b8c5ee20e2
/external/chromium/chrome/browser/prefs/pref_value_store.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_value_store.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_value_store.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_value_store.h
|