Merge 145601 - Added forced network scan to network dropdown.

chrome/browser/ui/webui/chromeos/login/network_dropdown.h

Index: chrome/browser/ui/webui/chromeos/login/network_dropdown.h
===================================================================
--- chrome/browser/ui/webui/chromeos/login/network_dropdown.h	(revision 146976)
+++ chrome/browser/ui/webui/chromeos/login/network_dropdown.h	(working copy)
@@ -6,9 +6,10 @@
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_
 
 #include "base/basictypes.h"
+#include "base/timer.h"
+#include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/status/network_menu.h"
 #include "chrome/browser/chromeos/status/network_menu_icon.h"
-#include "chrome/browser/chromeos/cros/network_library.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace content {
@@ -53,6 +54,10 @@
  private:
   void SetNetworkIconAndText();
 
+  // Forces network scan and refreshes control state. Should be called
+  // by |network_scan_timer_| only.
+  void ForceNetworkScan();
+
   // The Network menu.
   scoped_ptr<NetworkMenuWebUI> network_menu_;
   // The Network menu icon.
@@ -63,6 +68,9 @@
   // Is the dropdown shown on one of the OOBE screens.
   bool oobe_;
 
+  // Timer used to periodically force network scan.
+  base::RepeatingTimer<NetworkDropdown> network_scan_timer_;
+
   DISALLOW_COPY_AND_ASSIGN(NetworkDropdown);
 };