Merge 145601 - Added forced network scan to network dropdown.

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

 // 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.
 
 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown.h"
 
 #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"
 #include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "content/public/browser/web_ui.h"
 #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.
 class NetworkMenuWebUI : public NetworkMenu {
  public:
   NetworkMenuWebUI(NetworkMenu::Delegate* delegate, content::WebUI* web_ui);
 
   // NetworkMenu override:
   virtual void UpdateMenu() OVERRIDE;
 
@@ skipping 68 matching lines @@
 NetworkDropdown::NetworkDropdown(content::WebUI* web_ui,
                                  bool oobe)
     : web_ui_(web_ui),
       oobe_(oobe) {
   network_menu_.reset(new NetworkMenuWebUI(this, web_ui));
   network_icon_.reset(
       new NetworkMenuIcon(this, NetworkMenuIcon::DROPDOWN_MODE));
   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() {
   CrosLibrary::Get()->GetNetworkLibrary()->RemoveNetworkManagerObserver(this);
 }
 
 void NetworkDropdown::SetLastNetworkType(ConnectionType last_network_type) {
   network_icon_->set_last_network_type(last_network_type);
 }
 
@@ skipping 36 matching lines @@
   const SkBitmap icon_bitmap = network_icon_->GetIconAndText(&text);
   std::string icon_str =
       icon_bitmap.empty() ?
           std::string() : web_ui_util::GetImageDataUrl(icon_bitmap);
   base::StringValue title(text);
   base::StringValue icon(icon_str);
   web_ui_->CallJavascriptFunction("cr.ui.DropDown.updateNetworkTitle",
                                   title, icon);
 }
 
+void NetworkDropdown::ForceNetworkScan() {
+  CrosLibrary::Get()->GetNetworkLibrary()->RequestNetworkScan();
+  Refresh();
+}
+
 }  // namespace chromeos