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

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

Issue 8633012: [cros] Return proxy-settings back to the network menu list for OOBE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged Created 9 years, 1 month 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_LOGIN_NETWORK_DROPDOWN_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_
6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_ 6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "chrome/browser/chromeos/status/network_menu.h" 9 #include "chrome/browser/chromeos/status/network_menu.h"
10 #include "chrome/browser/chromeos/status/network_menu_icon.h" 10 #include "chrome/browser/chromeos/status/network_menu_icon.h"
11 #include "chrome/browser/chromeos/cros/network_library.h" 11 #include "chrome/browser/chromeos/cros/network_library.h"
12 #include "ui/gfx/native_widget_types.h" 12 #include "ui/gfx/native_widget_types.h"
13 #include "chrome/browser/chromeos/login/login_html_dialog.h" 13 #include "chrome/browser/chromeos/login/login_html_dialog.h"
14 14
15 namespace chromeos { 15 namespace chromeos {
16 16
17 class NetworkMenuWebUI; 17 class NetworkMenuWebUI;
18 18
19 // Class which implements network dropdown menu using WebUI. 19 // Class which implements network dropdown menu using WebUI.
20 class NetworkDropdown : public NetworkMenu::Delegate, 20 class NetworkDropdown : public NetworkMenu::Delegate,
21 public NetworkMenuIcon::Delegate, 21 public NetworkMenuIcon::Delegate,
22 NetworkLibrary::NetworkManagerObserver, 22 NetworkLibrary::NetworkManagerObserver,
23 public LoginHtmlDialog::Delegate { 23 public LoginHtmlDialog::Delegate {
24 public: 24 public:
25 NetworkDropdown(WebUI* web_ui, gfx::NativeWindow parent_window); 25 NetworkDropdown(WebUI* web_ui, gfx::NativeWindow parent_window, bool oobe);
26 virtual ~NetworkDropdown(); 26 virtual ~NetworkDropdown();
27 27
28 // This method should be called, when item with the given id is chosen. 28 // This method should be called, when item with the given id is chosen.
29 void OnItemChosen(int id); 29 void OnItemChosen(int id);
30 30
31 // NetworkMenu::Delegate implementation: 31 // NetworkMenu::Delegate implementation:
32 virtual views::MenuButton* GetMenuButton() OVERRIDE; 32 virtual views::MenuButton* GetMenuButton() OVERRIDE;
33 virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE; 33 virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE;
34 virtual void OpenButtonOptions() OVERRIDE; 34 virtual void OpenButtonOptions() OVERRIDE;
35 virtual bool ShouldOpenButtonOptions() const OVERRIDE; 35 virtual bool ShouldOpenButtonOptions() const OVERRIDE;
(...skipping 20 matching lines...) Expand all
56 56
57 // The Network menu. 57 // The Network menu.
58 scoped_ptr<NetworkMenuWebUI> network_menu_; 58 scoped_ptr<NetworkMenuWebUI> network_menu_;
59 // The Network menu icon. 59 // The Network menu icon.
60 scoped_ptr<NetworkMenuIcon> network_icon_; 60 scoped_ptr<NetworkMenuIcon> network_icon_;
61 // Proxy settings dialog that can be invoked from network menu. 61 // Proxy settings dialog that can be invoked from network menu.
62 scoped_ptr<LoginHtmlDialog> proxy_settings_dialog_; 62 scoped_ptr<LoginHtmlDialog> proxy_settings_dialog_;
63 63
64 WebUI* web_ui_; 64 WebUI* web_ui_;
65 65
66 // Is the dropdown shown on one of the OOBE screens.
67 bool oobe_;
68
66 DISALLOW_COPY_AND_ASSIGN(NetworkDropdown); 69 DISALLOW_COPY_AND_ASSIGN(NetworkDropdown);
67 }; 70 };
68 71
69 } // namespace chromeos 72 } // namespace chromeos
70 73
71 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_ 74 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698