Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2949)

Unified Diff: chrome/browser/profiles/profile_impl.h

Issue 11345008: Remove content::NotificationObserver dependency from most Prefs code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head for commit Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_impl.h ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_impl.h
diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h
index ad7c17f0444dcd6ebca0e835960bb2ff7628d7d9..36ed8bcf081c3ee843d27262f5cacbfd76e3c9cf 100644
--- a/chrome/browser/profiles/profile_impl.h
+++ b/chrome/browser/profiles/profile_impl.h
@@ -22,6 +22,7 @@
class NetPrefObserver;
class PrefService;
+class PrefServiceBase;
class PromoResourceService;
class SSLConfigServiceManager;
@@ -47,7 +48,8 @@ class ExtensionSystem;
// The default profile implementation.
class ProfileImpl : public Profile,
- public content::NotificationObserver {
+ public content::NotificationObserver,
+ public PrefObserver {
public:
// Value written to prefs when the exit type is EXIT_NORMAL. Public for tests.
static const char* const kPrefExitTypeNormal;
@@ -131,6 +133,10 @@ class ProfileImpl : public Profile,
const content::NotificationSource& source,
const content::NotificationDetails& details) OVERRIDE;
+ // PrefObserver implementation.
+ virtual void OnPreferenceChanged(PrefServiceBase* service,
+ const std::string& pref_name) OVERRIDE;
+
private:
friend class Profile;
FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest,
@@ -153,6 +159,9 @@ class ProfileImpl : public Profile,
void InitHostZoomMap();
+ void OnInitializationCompleted(PrefServiceBase* pref_service,
+ bool succeeded);
+
// Does final prefs initialization and calls Init().
void OnPrefsLoaded(bool success);
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_impl.h ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698