Merge 145601 - Added forced network scan to network dropdown.

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

Index: chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
===================================================================
--- chrome/browser/ui/webui/chromeos/login/network_dropdown.cc	(revision 146976)
+++ chrome/browser/ui/webui/chromeos/login/network_dropdown.cc	(working copy)
@@ -6,6 +6,7 @@
 
 #include <string>
 
+#include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/base_login_display_host.h"
@@ -15,6 +16,14 @@
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/font.h"
 
+namespace {
+
+// Timeout between consecutive requests to network library for network
+// scan.
+const int kNetworkScanIntervalSecs = 60;
+
+}  // namespace
+
 namespace chromeos {
 
 // WebUI specific implementation of the NetworkMenu class.
@@ -107,6 +116,9 @@
   CrosLibrary::Get()->GetNetworkLibrary()->AddNetworkManagerObserver(this);
   CrosLibrary::Get()->GetNetworkLibrary()->RequestNetworkScan();
   Refresh();
+  network_scan_timer_.Start(FROM_HERE,
+      base::TimeDelta::FromSeconds(kNetworkScanIntervalSecs),
+      this, &NetworkDropdown::ForceNetworkScan);
 }
 
 NetworkDropdown::~NetworkDropdown() {
@@ -166,4 +178,9 @@
                                   title, icon);
 }
 
+void NetworkDropdown::ForceNetworkScan() {
+  CrosLibrary::Get()->GetNetworkLibrary()->RequestNetworkScan();
+  Refresh();
+}
+
 }  // namespace chromeos