diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-23 06:43:50 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-23 06:43:50 -0700 |
| commit | 12ce095c849adc91534e1cde73d42fddd1b72570 (patch) | |
| tree | 404fc461f6c687c2ed1453aae5dcf8b05400915a /chrome/browser/prefs | |
| parent | 98c2c8d33e91ce6896d0d55bd87ff409c18e3dab (diff) | |
| parent | ebacd7412c239b49bc44f045419b3011cc356bef (diff) | |
| download | external_chromium-12ce095c849adc91534e1cde73d42fddd1b72570.zip external_chromium-12ce095c849adc91534e1cde73d42fddd1b72570.tar.gz external_chromium-12ce095c849adc91534e1cde73d42fddd1b72570.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/pref_value_store.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/browser/prefs/pref_value_store.cc b/chrome/browser/prefs/pref_value_store.cc index 3680431..bfe00b4 100644 --- a/chrome/browser/prefs/pref_value_store.cc +++ b/chrome/browser/prefs/pref_value_store.cc @@ -4,9 +4,7 @@ #include "chrome/browser/prefs/pref_value_store.h" -#ifdef ANDROID #include "base/logging.h" -#endif #include "chrome/browser/prefs/pref_notifier.h" PrefValueStore::PrefStoreKeeper::PrefStoreKeeper() |