Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1024)

Side by Side Diff: chrome/browser/ui/webui/chromeos/proxy_settings_ui.h

Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync to head to clear linux_chromeos browsertest failures Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_PROXY_SETTINGS_UI_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_PROXY_SETTINGS_UI_H_
6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_PROXY_SETTINGS_UI_H_ 6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_PROXY_SETTINGS_UI_H_
7 #pragma once 7 #pragma once
8 8
9 #include "chrome/browser/ui/webui/options/options_ui.h" 9 #include "chrome/browser/ui/webui/options/options_ui.h"
10 #include "content/browser/webui/web_ui.h"
11 #include "content/public/browser/web_ui_controller.h" 10 #include "content/public/browser/web_ui_controller.h"
12 11
13 namespace chromeos { 12 namespace chromeos {
14 13
14 class CoreChromeOSOptionsHandler;
15 class ProxyHandler; 15 class ProxyHandler;
16 16
17 // A WebUI to host proxy settings splitted from settings page for better 17 // A WebUI to host proxy settings splitted from settings page for better
18 // performance. 18 // performance.
19 class ProxySettingsUI : public WebUI, public content::WebUIController, 19 class ProxySettingsUI : public content::WebUIController,
20 public OptionsPageUIHandlerHost { 20 public OptionsPageUIHandlerHost {
21 public: 21 public:
22 explicit ProxySettingsUI(content::WebContents* contents); 22 explicit ProxySettingsUI(WebUI* web_ui);
23 virtual ~ProxySettingsUI(); 23 virtual ~ProxySettingsUI();
24 24
25 private: 25 private:
26 // Overridden from OptionsPageUIHandlerHost: 26 // Overridden from OptionsPageUIHandlerHost:
27 virtual void InitializeHandlers() OVERRIDE; 27 virtual void InitializeHandlers() OVERRIDE;
28 28
29 chromeos::ProxyHandler* proxy_handler_; // Weak ptr. 29 ProxyHandler* proxy_handler_; // Weak ptr.
30 CoreChromeOSOptionsHandler* core_handler_; // WeakPtr.
30 31
31 DISALLOW_COPY_AND_ASSIGN(ProxySettingsUI); 32 DISALLOW_COPY_AND_ASSIGN(ProxySettingsUI);
32 }; 33 };
33 34
34 } // namespace chromeos 35 } // namespace chromeos
35 36
36 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_PROXY_SETTINGS_UI_H_ 37 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_PROXY_SETTINGS_UI_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698