| 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
ref_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
rowser_prefs.cc
ommand_line_pref_store.cc
ommand_line_pref_store.h
ommand_line_pref_store_unittest.cc
efault_pref_store.cc
verlay_persistent_pref_store.cc
verlay_persistent_pref_store.h
verlay_persistent_pref_store_unittest.cc
ref_member.cc
ref_member.h
ref_member_unittest.cc
ref_notifier_impl.cc
ref_observer_mock.h
ref_service.cc
ref_service.h
ref_service_mock_builder.cc
ref_service_mock_builder.h
ref_service_uitest.cc
ref_service_unittest.cc
ref_set_observer.cc
ref_set_observer.h
ref_value_map.cc
ref_value_map.h
ref_value_map_unittest.cc
ref_value_store.cc
ref_value_store.h
ref_value_store_unittest.cc
roxy_config_dictionary.h
roxy_config_dictionary_unittest.cc
coped_user_pref_update.cc
coped_user_pref_update.h
coped_user_pref_update_unittest.cc
ession_startup_pref.cc
esting_pref_store.cc
esting_pref_store.h
alue_map_pref_store.cc
alue_map_pref_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
rowser_prefs.cc
rowser_prefs.h
verlay_persistent_pref_store.cc
verlay_persistent_pref_store.h
ref_change_registrar_unittest.cc
ref_member.cc
ref_member.h
ref_member_unittest.cc
ref_notifier_impl_unittest.cc
ref_service.cc
ref_service.h
ref_service_mock_builder.cc
ref_set_observer_unittest.cc
ref_value_store.cc
ref_value_store.h
ref_value_store_unittest.cc
coped_pref_update.cc
coped_pref_update.h
coped_user_pref_update.cc
coped_user_pref_update.h
ession_startup_pref.cc
ession_startup_pref_unittest.cc
esting_pref_store.cc
esting_pref_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
ref_service.cc
ref_service.h
ref_value_store.cc
ref_value_store.h
|
| 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
ref_service.cc
|
| 5b4f7dfc48ceaeeb1088cf6e84ba69f994c3861b |
07-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r11.0.672.0: Fix conflicts in pref_value_store.cc
Upstream change close to local commit:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_value_store.cc?view=diff&pathrev=74924&r1=72786&r2=72787
Change-Id: Ic2f680446e0bc5ff84edc91bc22c2b287638c81d
ref_value_store.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
ref_service.cc
|
| 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
ref_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
rowser_prefs.cc
rowser_prefs.h
ommand_line_pref_store.cc
ommand_line_pref_store_unittest.cc
efault_pref_store.cc
efault_pref_store.h
verlay_persistent_pref_store.cc
verlay_persistent_pref_store.h
verlay_persistent_pref_store_unittest.cc
ref_change_registrar.cc
ref_change_registrar_unittest.cc
ref_member.cc
ref_member.h
ref_member_unittest.cc
ref_service.cc
ref_service.h
ref_service_mock_builder.cc
ref_service_mock_builder.h
ref_service_uitest.cc
ref_service_unittest.cc
ref_set_observer.cc
ref_value_map.cc
ref_value_map.h
ref_value_store.cc
ref_value_store.h
ref_value_store_unittest.cc
roxy_config_dictionary.cc
roxy_config_dictionary.h
roxy_config_dictionary_unittest.cc
roxy_prefs.cc
roxy_prefs.h
roxy_prefs_unittest.cc
esting_pref_store.cc
esting_pref_store.h
alue_map_pref_store.cc
alue_map_pref_store.h
|
| 3f50c38dc070f4bb515c1b64450dae14f316474e |
24-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r10.0.634.0: Initial merge by git.
Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
rowser_prefs.cc
ref_notifier_impl.h
ref_observer_mock.cc
ref_observer_mock.h
ref_service.h
ref_service_mock_builder.cc
ref_service_mock_builder.h
|
| 12ce095c849adc91534e1cde73d42fddd1b72570 |
23-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge changes I17af2234,I46f12b11,I53e91650,Ia924ea7c,Icd55c23e
* changes:
Remove #ifdef ANDROID for cherry-pick
First pass at removing local changes from autofill
Removing the NullProxy, better Android implementation
Remove local changes in unused proxy_config_service_linux.h
Removing local changes that strip out vlog
|
| 98c2c8d33e91ce6896d0d55bd87ff409c18e3dab |
23-May-2011 |
Kristian Monsen <kristianm@google.com> |
Fix for bug 4466763: Browser crashes after performing some activity
Android doesn't create a PrefNotifier, it is used withouta NULL
check. Called a function on pref_notifier_, which was NULL.
Change-Id: I9143dd56531f2410b57ae462b4597f90782c5817
ref_value_store.cc
|
| ebacd7412c239b49bc44f045419b3011cc356bef |
20-May-2011 |
Kristian Monsen <kristianm@google.com> |
Remove #ifdef ANDROID for cherry-pick
This is now a cherry-pick of:
http://codereview.chromium.org/7051012/
Change-Id: I17af22348ae2c62cf15447e7a2158384913dc7e5
ref_value_store.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
ref_service.cc
ref_service.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
ref_value_store.cc
ref_value_store.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
ref_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
rowser_prefs.cc
ommand_line_pref_store.cc
ommand_line_pref_store.h
ommand_line_pref_store_unittest.cc
efault_pref_store.cc
efault_pref_store.h
ummy_pref_store.cc
ummy_pref_store.h
ref_change_registrar.cc
ref_change_registrar_unittest.cc
ref_member_unittest.cc
ref_notifier.cc
ref_notifier.h
ref_notifier_impl.cc
ref_notifier_impl.h
ref_notifier_impl_unittest.cc
ref_notifier_unittest.cc
ref_observer_mock.h
ref_service.cc
ref_service.h
ref_service_mock_builder.cc
ref_service_mock_builder.h
ref_service_unittest.cc
ref_set_observer.cc
ref_value_map.cc
ref_value_map.h
ref_value_map_unittest.cc
ref_value_store.cc
ref_value_store.h
ref_value_store_unittest.cc
roxy_prefs.cc
roxy_prefs.h
roxy_prefs_unittest.cc
coped_pref_update.cc
ession_startup_pref.cc
esting_pref_store.cc
esting_pref_store.h
alue_map_pref_store.cc
alue_map_pref_store.h
|
| ac1e49eb6695f711d72215fcdf9388548942a00d |
16-Jan-2011 |
Ben Murdoch <benm@google.com> |
Merge Chromium at 9.0.597.69: Trivial merge by Git.
/branches/597/src@71538
Change-Id: Id9fad65a5e6d2ab901d9c8bff6dbf96ab7977f36
rowser_prefs.cc
ommand_line_pref_store.cc
|
| 78494470aa829a52d6709093dd00e7704053e806 |
07-Jan-2011 |
Ben Murdoch <benm@google.com> |
Merge chromium at 9.0.597.55: Fix conflicts.
tab_contents.h:
http://src.chromium.org/viewvc/chrome?view=rev&revision=67659
pref_value_store.cc
http://src.chromium.org/viewvc/chrome?view=rev&revision=66755
base_paths_linux.cc
http://src.chromium.org/viewvc/chrome?view=rev&revision=67202
personal_data_manager.cc
http://src.chromium.org/viewvc/chrome?view=rev&revision=67344
autofill_manager.cc
http://src.chromium.org/viewvc/chrome?view=rev&revision=67599
Change-Id: I7016d521fa2f2f13d0c50e5609b72ceaae64d8f0
ref_value_store.cc
|
| 201ade2fbba22bfb27ae029f4d23fca6ded109a0 |
07-Jan-2011 |
Ben Murdoch <benm@google.com> |
Merge chromium at 9.0.597.55: Initial merge by git.
Change-Id: Id686a88437441ec7e17abb3328a404c7b6c3c6ad
rowser_prefs.cc
ref_notifier_unittest.cc
ref_value_store.cc
ref_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
ref_value_store.cc
ref_value_store.h
|
| 4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7 |
25-Nov-2010 |
Ben Murdoch <benm@google.com> |
Merge Chromium at r66597: Initial merge by git.
Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
rowser_prefs.cc
ommand_line_pref_store.cc
ref_notifier.h
ref_notifier_unittest.cc
ref_service.cc
ref_service_unittest.cc
ref_value_store.cc
ref_value_store.h
ref_value_store_unittest.cc
|
| 513209b27ff55e2841eac0e4120199c23acce758 |
18-Nov-2010 |
Ben Murdoch <benm@google.com> |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
rowser_prefs.cc
ommand_line_pref_store.cc
ommand_line_pref_store.h
efault_pref_store.cc
efault_pref_store.h
ummy_pref_store.h
ref_service_unittest.cc
|
| 82855d1006d8ec9d2190b6ca599820b0ab39e4fc |
02-Nov-2010 |
Iain Merrick <husky@google.com> |
Merge Chromium at r63472 : Fix pref_value_store.cc
HasPolicyConflictingUserProxySettings method added. I think
this do-nothing implementation is correct because we don't have
any real pref stores. (Removing this method completely would be
a bigger diff as it's called from a few different places.)
http://src.chromium.org/viewvc/chrome?view=rev&revision=62716
Change-Id: I345522467a7a880abf698450de14b2c04522ae75
ref_value_store.cc
|
| 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
ref_value_store.cc
ref_value_store.h
|
| 731df977c0511bca2206b5f333555b1205ff1f43 |
01-Nov-2010 |
Iain Merrick <husky@google.com> |
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
rowser_prefs.cc
ommand_line_pref_store.cc
ommand_line_pref_store.h
ommand_line_pref_store_unittest.cc
ref_member.h
ref_notifier.cc
ref_service.cc
ref_service.h
ref_service_unittest.cc
ref_set_observer.cc
ref_set_observer.h
ref_value_store.cc
ref_value_store.h
ref_value_store_unittest.cc
ession_startup_pref.cc
ession_startup_pref.h
ession_startup_pref_unittest.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
ref_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
ref_service.cc
ref_service.h
ref_value_store.cc
ref_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
rowser_prefs.cc
rowser_prefs.h
ommand_line_pref_store.cc
ommand_line_pref_store.h
ommand_line_pref_store_unittest.cc
efault_pref_store.cc
efault_pref_store.h
ummy_pref_store.cc
ummy_pref_store.h
ref_change_registrar.cc
ref_change_registrar.h
ref_change_registrar_unittest.cc
ref_member.cc
ref_member.h
ref_member_unittest.cc
ref_notifier.cc
ref_notifier.h
ref_notifier_unittest.cc
ref_service.cc
ref_service.h
ref_service_uitest.cc
ref_service_unittest.cc
ref_set_observer.cc
ref_set_observer.h
ref_set_observer_unittest.cc
ref_value_store.cc
ref_value_store.h
ref_value_store_unittest.cc
coped_pref_update.cc
coped_pref_update.h
ession_startup_pref.cc
ession_startup_pref.h
|