diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-02 14:05:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-14 20:31:42 -0700 |
| commit | 47ac375301e695030d3c8c8a1cacc7d2ea54e89f (patch) | |
| tree | 9ecb5ce11bdc5e2ef8a219343f2c5c329963125a /chrome | |
| parent | ae05a4e8ea873f25be36252035e176a8e0a7348e (diff) | |
| download | external_chromium-47ac375301e695030d3c8c8a1cacc7d2ea54e89f.zip external_chromium-47ac375301e695030d3c8c8a1cacc7d2ea54e89f.tar.gz external_chromium-47ac375301e695030d3c8c8a1cacc7d2ea54e89f.tar.bz2 | |
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
Diffstat (limited to 'chrome')
| -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 |