| Index: chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h
|
| diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h
|
| index 122df379d328410cb11ae397df6bb7d00817bc16..19434745c231e4314f047d586870831e7dfc578f 100644
|
| --- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h
|
| +++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h
|
| @@ -21,10 +21,10 @@ class CoreChromeOSOptionsHandler : public CoreOptionsHandler {
|
| protected:
|
| // ::CoreOptionsHandler overrides
|
| virtual void Initialize();
|
| - virtual Value* FetchPref(const std::string& pref_name);
|
| + virtual base::Value* FetchPref(const std::string& pref_name);
|
| virtual void ObservePref(const std::string& pref_name);
|
| virtual void SetPref(const std::string& pref_name,
|
| - const Value* value,
|
| + const base::Value* value,
|
| const std::string& metric);
|
| virtual void StopObservingPref(const std::string& path);
|
|
|
| @@ -36,12 +36,15 @@ class CoreChromeOSOptionsHandler : public CoreOptionsHandler {
|
| private:
|
| // Notifies registered JS callbacks on ChromeOS setting change.
|
| void NotifySettingsChanged(const std::string* setting_name);
|
| + void NotifyNetworkChanged();
|
|
|
| // Keeps the track of change caused by the handler to make sure
|
| // it does not signal itself again.
|
| bool handling_change_;
|
|
|
| scoped_ptr<PrefSetObserver> proxy_prefs_;
|
| + content::NotificationRegistrar proxy_registrar_;
|
| + int proxy_registrar_clients_;
|
| };
|
|
|
| } // namespace chromeos
|
|
|