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

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

Issue 10692111: Added forced network scan to network dropdown. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Added comment to NetworkDropdown::ForceNetworkScan Created 8 years, 5 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
« no previous file with comments | « no previous file | chrome/browser/ui/webui/chromeos/login/network_dropdown.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/timer.h"
10 #include "chrome/browser/chromeos/cros/network_library.h"
9 #include "chrome/browser/chromeos/status/network_menu.h" 11 #include "chrome/browser/chromeos/status/network_menu.h"
10 #include "chrome/browser/chromeos/status/network_menu_icon.h" 12 #include "chrome/browser/chromeos/status/network_menu_icon.h"
11 #include "chrome/browser/chromeos/cros/network_library.h"
12 #include "ui/gfx/native_widget_types.h" 13 #include "ui/gfx/native_widget_types.h"
13 14
14 namespace content { 15 namespace content {
15 class WebUI; 16 class WebUI;
16 } 17 }
17 18
18 namespace chromeos { 19 namespace chromeos {
19 20
20 class NetworkMenuWebUI; 21 class NetworkMenuWebUI;
21 22
(...skipping 23 matching lines...) Expand all
45 virtual void OnNetworkManagerChanged(NetworkLibrary* cros) OVERRIDE; 46 virtual void OnNetworkManagerChanged(NetworkLibrary* cros) OVERRIDE;
46 47
47 // Refreshes control state. Usually there's no need to do it manually 48 // Refreshes control state. Usually there's no need to do it manually
48 // as control refreshes itself on network state change. 49 // as control refreshes itself on network state change.
49 // Should be called on language change. 50 // Should be called on language change.
50 void Refresh(); 51 void Refresh();
51 52
52 private: 53 private:
53 void SetNetworkIconAndText(); 54 void SetNetworkIconAndText();
54 55
56 // Forces network scan and refreshes control state. Should be called
57 // by |network_scan_timer_| only.
58 void ForceNetworkScan();
59
55 // The Network menu. 60 // The Network menu.
56 scoped_ptr<NetworkMenuWebUI> network_menu_; 61 scoped_ptr<NetworkMenuWebUI> network_menu_;
57 // The Network menu icon. 62 // The Network menu icon.
58 scoped_ptr<NetworkMenuIcon> network_icon_; 63 scoped_ptr<NetworkMenuIcon> network_icon_;
59 64
60 content::WebUI* web_ui_; 65 content::WebUI* web_ui_;
61 66
62 // Is the dropdown shown on one of the OOBE screens. 67 // Is the dropdown shown on one of the OOBE screens.
63 bool oobe_; 68 bool oobe_;
64 69
70 // Timer used to periodically force network scan.
71 base::RepeatingTimer<NetworkDropdown> network_scan_timer_;
72
65 DISALLOW_COPY_AND_ASSIGN(NetworkDropdown); 73 DISALLOW_COPY_AND_ASSIGN(NetworkDropdown);
66 }; 74 };
67 75
68 } // namespace chromeos 76 } // namespace chromeos
69 77
70 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_ 78 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/webui/chromeos/login/network_dropdown.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698