diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-21 21:01:51 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-21 21:01:51 +0000 |
| commit | 8f63d7a84c3439e66eab8a97828812cb65a3f285 (patch) | |
| tree | 7bbfe4f5946f28ff7236976436b5cfd811bb5bf7 /chrome/browser/prefs/pref_service.h | |
| parent | c8267a9c8819a0cc4f8e4313147dcf13af9f1e91 (diff) | |
| download | chromium_src-8f63d7a84c3439e66eab8a97828812cb65a3f285.zip chromium_src-8f63d7a84c3439e66eab8a97828812cb65a3f285.tar.gz chromium_src-8f63d7a84c3439e66eab8a97828812cb65a3f285.tar.bz2 | |
Fix the VS2005 build.
VS2005 gets confused when a class inherits from Foo::Delegate
and also defines an inner class with the name Delegate.
The fix is to move the inner class out.
R=mirandac
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6891006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82553 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs/pref_service.h')
| -rw-r--r-- | chrome/browser/prefs/pref_service.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/chrome/browser/prefs/pref_service.h b/chrome/browser/prefs/pref_service.h index 3b43cb3..ceab457 100644 --- a/chrome/browser/prefs/pref_service.h +++ b/chrome/browser/prefs/pref_service.h @@ -33,6 +33,13 @@ class PrefMemberBase; class ScopedUserPrefUpdateBase; }; +class PrefService; + +class PrefServiceDelegate { + public: + virtual void OnPrefsLoaded(PrefService* prefs, bool success) = 0; +}; + class PrefService : public base::NonThreadSafe, public JsonPrefStore::Delegate { public: @@ -113,11 +120,6 @@ class PrefService : public base::NonThreadSafe, DISALLOW_COPY_AND_ASSIGN(Preference); }; - class Delegate { - public: - virtual void OnPrefsLoaded(PrefService* prefs, bool success) = 0; - }; - // JsonPrefStore::Delegate implementaion. virtual void OnPrefsRead(PersistentPrefStore::PrefReadError error, bool no_dir); @@ -137,7 +139,7 @@ class PrefService : public base::NonThreadSafe, static PrefService* CreatePrefServiceAsync(const FilePath& pref_filename, PrefStore* extension_pref_store, Profile* profile, - Delegate* delegate); + PrefServiceDelegate* delegate); // Creates an incognito copy of the pref service that shares most pref stores // but uses a fresh non-persistent overlay for the user pref store and an @@ -259,7 +261,7 @@ class PrefService : public base::NonThreadSafe, PrefStore* recommended_platform_prefs, PrefStore* recommended_cloud_prefs, DefaultPrefStore* default_store, - Delegate* delegate); + PrefServiceDelegate* delegate); // The PrefNotifier handles registering and notifying preference observers. // It is created and owned by this PrefService. Subclasses may access it for @@ -343,7 +345,7 @@ class PrefService : public base::NonThreadSafe, // Holds delegator to be called after initialization, if async version // is used. - Delegate* delegate_; + PrefServiceDelegate* delegate_; DISALLOW_COPY_AND_ASSIGN(PrefService); }; |