| Index: chrome/browser/ui/webui/chromeos/proxy_settings_ui.h
|
| diff --git a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.h b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.h
|
| index a1fafe7c363ad50f38fc0da44527080011926e60..6c3fabf443e73ef238e9fb067f08bc1aba34aee4 100644
|
| --- a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.h
|
| +++ b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.h
|
| @@ -10,7 +10,7 @@
|
|
|
| namespace chromeos {
|
|
|
| -namespace options2 {
|
| +namespace options {
|
| class CoreChromeOSOptionsHandler;
|
| class ProxyHandler;
|
| }
|
| @@ -18,7 +18,7 @@ class ProxyHandler;
|
| // A WebUI to host proxy settings splitted from settings page for better
|
| // performance.
|
| class ProxySettingsUI : public content::WebUIController,
|
| - public ::options2::OptionsPageUIHandlerHost {
|
| + public ::options::OptionsPageUIHandlerHost {
|
| public:
|
| explicit ProxySettingsUI(content::WebUI* web_ui);
|
| virtual ~ProxySettingsUI();
|
| @@ -27,8 +27,8 @@ class ProxySettingsUI : public content::WebUIController,
|
| // Overridden from OptionsPageUIHandlerHost:
|
| virtual void InitializeHandlers() OVERRIDE;
|
|
|
| - options2::ProxyHandler* proxy_handler_; // Weak ptr.
|
| - options2::CoreChromeOSOptionsHandler* core_handler_; // WeakPtr.
|
| + options::ProxyHandler* proxy_handler_; // Weak ptr.
|
| + options::CoreChromeOSOptionsHandler* core_handler_; // WeakPtr.
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ProxySettingsUI);
|
| };
|
|
|