Merge 145601 - Added forced network scan to network dropdown.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_
 #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 {
 class WebUI;
 }
 
 namespace chromeos {
 
 class NetworkMenuWebUI;
 
@@ skipping 24 matching lines @@
   virtual void OnNetworkManagerChanged(NetworkLibrary* cros) OVERRIDE;
 
   // Refreshes control state. Usually there's no need to do it manually
   // as control refreshes itself on network state change.
   // Should be called on language change.
   void Refresh();
 
  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.
   scoped_ptr<NetworkMenuIcon> network_icon_;
 
   content::WebUI* web_ui_;
 
   // 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);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_