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

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

Issue 8681029: [cros] Make disconnected icons used by network drop-down and network button consistent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: default Created 9 years 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, bool oobe); 25 NetworkDropdown(WebUI* web_ui, gfx::NativeWindow parent_window,
26 bool oobe, ConnectionType last_network_type);
stevenjb 2011/11/28 19:35:45 Again, I would rather see a setter added here.
altimofeev 2011/11/29 17:10:46 Done.
26 virtual ~NetworkDropdown(); 27 virtual ~NetworkDropdown();
27 28
28 // This method should be called, when item with the given id is chosen. 29 // This method should be called, when item with the given id is chosen.
29 void OnItemChosen(int id); 30 void OnItemChosen(int id);
30 31
31 // NetworkMenu::Delegate implementation: 32 // NetworkMenu::Delegate implementation:
32 virtual views::MenuButton* GetMenuButton() OVERRIDE; 33 virtual views::MenuButton* GetMenuButton() OVERRIDE;
33 virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE; 34 virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE;
34 virtual void OpenButtonOptions() OVERRIDE; 35 virtual void OpenButtonOptions() OVERRIDE;
35 virtual bool ShouldOpenButtonOptions() const OVERRIDE; 36 virtual bool ShouldOpenButtonOptions() const OVERRIDE;
(...skipping 29 matching lines...) Expand all
65 66
66 // Is the dropdown shown on one of the OOBE screens. 67 // Is the dropdown shown on one of the OOBE screens.
67 bool oobe_; 68 bool oobe_;
68 69
69 DISALLOW_COPY_AND_ASSIGN(NetworkDropdown); 70 DISALLOW_COPY_AND_ASSIGN(NetworkDropdown);
70 }; 71 };
71 72
72 } // namespace chromeos 73 } // namespace chromeos
73 74
74 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_ 75 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698