| 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);
|
|
|
|
|