diff options
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/pref_service.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/prefs/pref_service.h b/chrome/browser/prefs/pref_service.h index 2c28d6a..d844739 100644 --- a/chrome/browser/prefs/pref_service.h +++ b/chrome/browser/prefs/pref_service.h @@ -277,15 +277,12 @@ class PrefService : public base::NonThreadSafe { friend class PrefChangeRegistrar; friend class subtle::PrefMemberBase; -<<<<<<< HEAD -#ifndef ANDROID -======= // Construct an incognito version of the pref service. Use // CreateIncognitoPrefService() instead of calling this constructor directly. PrefService(const PrefService& original, PrefStore* incognito_extension_prefs); ->>>>>>> chromium.org at r11.0.672.0 +#ifndef ANDROID // If the pref at the given path changes, we call the observer's Observe // method with PREF_CHANGED. Note that observers should not call these methods // directly but rather use a PrefChangeRegistrar to make sure the observer |