diff options
Diffstat (limited to 'chrome/browser/prefs')
-rw-r--r-- | chrome/browser/prefs/command_line_pref_store.h | 4 | ||||
-rw-r--r-- | chrome/browser/prefs/incognito_mode_prefs.h | 7 | ||||
-rw-r--r-- | chrome/browser/prefs/pref_service_syncable_factory.h | 7 |
3 files changed, 12 insertions, 6 deletions
diff --git a/chrome/browser/prefs/command_line_pref_store.h b/chrome/browser/prefs/command_line_pref_store.h index 066d005..eb4b94f 100644 --- a/chrome/browser/prefs/command_line_pref_store.h +++ b/chrome/browser/prefs/command_line_pref_store.h @@ -14,7 +14,7 @@ // such as proxy settings. class CommandLinePrefStore : public ValueMapPrefStore { public: - explicit CommandLinePrefStore(const CommandLine* command_line); + explicit CommandLinePrefStore(const base::CommandLine* command_line); protected: virtual ~CommandLinePrefStore(); @@ -58,7 +58,7 @@ class CommandLinePrefStore : public ValueMapPrefStore { void ApplyBackgroundModeSwitches(); // Weak reference. - const CommandLine* command_line_; + const base::CommandLine* command_line_; // Mappings of command line switches to prefs. static const BooleanSwitchToPreferenceMapEntry boolean_switch_map_[]; diff --git a/chrome/browser/prefs/incognito_mode_prefs.h b/chrome/browser/prefs/incognito_mode_prefs.h index 698250f..d7d8d29 100644 --- a/chrome/browser/prefs/incognito_mode_prefs.h +++ b/chrome/browser/prefs/incognito_mode_prefs.h @@ -7,10 +7,13 @@ #include "base/basictypes.h" -class CommandLine; class PrefService; class Profile; +namespace base { +class CommandLine; +} + namespace user_prefs { class PrefRegistrySyncable; } @@ -52,7 +55,7 @@ class IncognitoModePrefs { static bool IntToAvailability(int in_value, Availability* out_value); // Returns true if the browser should start in incognito mode. - static bool ShouldLaunchIncognito(const CommandLine& command_line, + static bool ShouldLaunchIncognito(const base::CommandLine& command_line, const PrefService* prefs); // Returns true if |profile| can open a new Browser. This checks the incognito diff --git a/chrome/browser/prefs/pref_service_syncable_factory.h b/chrome/browser/prefs/pref_service_syncable_factory.h index 715244e..b3d326c 100644 --- a/chrome/browser/prefs/pref_service_syncable_factory.h +++ b/chrome/browser/prefs/pref_service_syncable_factory.h @@ -7,9 +7,12 @@ #include "base/prefs/pref_service_factory.h" -class CommandLine; class PrefServiceSyncable; +namespace base { +class CommandLine; +} + namespace policy { class PolicyService; } @@ -33,7 +36,7 @@ class PrefServiceSyncableFactory : public base::PrefServiceFactory { #endif // Specifies to use an actual command-line backed command-line pref store. - void SetCommandLine(CommandLine* command_line); + void SetCommandLine(base::CommandLine* command_line); scoped_ptr<PrefServiceSyncable> CreateSyncable( user_prefs::PrefRegistrySyncable* registry); |