| 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 91967abf740ae8dad8cd3dd9f550b250765c250d..e7d1f1942a92dce3f99710762804d39528e82710 100644
|
| --- a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.h
|
| +++ b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.h
|
| @@ -6,18 +6,20 @@
|
| #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_PROXY_SETTINGS_UI_H_
|
| #pragma once
|
|
|
| -#include "chrome/browser/ui/webui/options/options_ui.h"
|
| +#include "chrome/browser/ui/webui/options2/options_ui2.h"
|
| #include "content/public/browser/web_ui_controller.h"
|
|
|
| namespace chromeos {
|
|
|
| +namespace options2 {
|
| class CoreChromeOSOptionsHandler;
|
| class ProxyHandler;
|
| +}
|
|
|
| // A WebUI to host proxy settings splitted from settings page for better
|
| // performance.
|
| class ProxySettingsUI : public content::WebUIController,
|
| - public OptionsPageUIHandlerHost {
|
| + public ::options2::OptionsPageUIHandlerHost {
|
| public:
|
| explicit ProxySettingsUI(content::WebUI* web_ui);
|
| virtual ~ProxySettingsUI();
|
| @@ -26,8 +28,8 @@ class ProxySettingsUI : public content::WebUIController,
|
| // Overridden from OptionsPageUIHandlerHost:
|
| virtual void InitializeHandlers() OVERRIDE;
|
|
|
| - ProxyHandler* proxy_handler_; // Weak ptr.
|
| - CoreChromeOSOptionsHandler* core_handler_; // WeakPtr.
|
| + options2::ProxyHandler* proxy_handler_; // Weak ptr.
|
| + options2::CoreChromeOSOptionsHandler* core_handler_; // WeakPtr.
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ProxySettingsUI);
|
| };
|
|
|