| Index: chrome/browser/prefs/command_line_pref_store.h
|
| diff --git a/chrome/browser/prefs/command_line_pref_store.h b/chrome/browser/prefs/command_line_pref_store.h
|
| index 8dd7cd501418a795eb14b44ffed6d0d35ef7348c..2ea29ae8d001fa5f822e80bf1c9054c60bf15152 100644
|
| --- a/chrome/browser/prefs/command_line_pref_store.h
|
| +++ b/chrome/browser/prefs/command_line_pref_store.h
|
| @@ -22,7 +22,7 @@ class CommandLinePrefStore : public PrefStore {
|
|
|
| // PrefStore methods:
|
| virtual PrefReadError ReadPrefs();
|
| - virtual DictionaryValue* prefs();
|
| + virtual DictionaryValue* prefs() const { return prefs_.get(); }
|
|
|
| protected:
|
| // Logs a message and returns false if the proxy switches are
|
| @@ -30,16 +30,10 @@ class CommandLinePrefStore : public PrefStore {
|
| bool ValidateProxySwitches();
|
|
|
| private:
|
| - // Weak reference.
|
| - const CommandLine* command_line_;
|
| -
|
| - scoped_ptr<DictionaryValue> prefs_;
|
| -
|
| struct StringSwitchToPreferenceMapEntry {
|
| const char* switch_name;
|
| const char* preference_path;
|
| };
|
| - static const StringSwitchToPreferenceMapEntry string_switch_map_[];
|
|
|
| // |set_value| indicates what the preference should be set to if the switch
|
| // is present.
|
| @@ -54,6 +48,13 @@ class CommandLinePrefStore : public PrefStore {
|
| // corresponding preferences in this pref store.
|
| void ApplySimpleSwitches();
|
|
|
| + // Weak reference.
|
| + const CommandLine* command_line_;
|
| +
|
| + scoped_ptr<DictionaryValue> prefs_;
|
| +
|
| + static const StringSwitchToPreferenceMapEntry string_switch_map_[];
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(CommandLinePrefStore);
|
| };
|
|
|
|
|