Add a unified observer to replace NetworkManagerObserver

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/chromeos/net/connectivity_state_helper.h"
 #include "content/public/browser/web_ui.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/webui/web_ui_util.h"
 
 namespace {
 
 // Timeout between consecutive requests to network library for network
@@ skipping 83 matching lines @@
 
 // NetworkDropdown -------------------------------------------------------------
 
 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);
+  ConnectivityStateHelper::Get()->AddNetworkManagerObserver(this);
   CrosLibrary::Get()->GetNetworkLibrary()->RequestNetworkScan();

[stevenjb, 2013/03/11 23:11:05]

If we add RequestScan() to ConnectivityStateHelper (which seems reasonable) then
we can get rid of NetworkLibrary here entirely. Otherwise I would wait on this
also...

[gauravsh, 2013/03/12 00:30:25]

See my comment in mobile_activator. This shouldn't change the default behavior
since the change notifier flag is disabled - so we'll use the NetworkLibrary
path.

[gauravsh, 2013/03/12 18:18:10]

Actually, RequestScan() is simple to add, so did so.

   Refresh();
   network_scan_timer_.Start(FROM_HERE,
       base::TimeDelta::FromSeconds(kNetworkScanIntervalSecs),
       this, &NetworkDropdown::ForceNetworkScan);
 }
 
 NetworkDropdown::~NetworkDropdown() {
-  CrosLibrary::Get()->GetNetworkLibrary()->RemoveNetworkManagerObserver(this);
+  ConnectivityStateHelper::Get()->RemoveNetworkManagerObserver(this);
 }
 
 void NetworkDropdown::SetLastNetworkType(ConnectionType last_network_type) {
   // No longer implemented. TODO(stevenjb): Purge from JS.
 }
 
 void NetworkDropdown::OnItemChosen(int id) {
   network_menu_->OnItemChosen(id);
 }
 
 gfx::NativeWindow NetworkDropdown::GetNativeWindow() const {
   return BaseLoginDisplayHost::default_host()->GetNativeWindow();
 }
 
 void NetworkDropdown::OpenButtonOptions() {
   BaseLoginDisplayHost::default_host()->OpenProxySettings();
 }
 
 bool NetworkDropdown::ShouldOpenButtonOptions() const {
   return !oobe_;
 }
 
-void NetworkDropdown::OnNetworkManagerChanged(NetworkLibrary* cros) {
+void NetworkDropdown::NetworkManagerChanged() {
   Refresh();
 }
 
 void NetworkDropdown::Refresh() {
   SetNetworkIconAndText();
   network_menu_->UpdateMenu();
 }
 
 void NetworkDropdown::NetworkMenuIconChanged() {
   SetNetworkIconAndText();
@@ skipping 12 matching lines @@
   web_ui_->CallJavascriptFunction("cr.ui.DropDown.updateNetworkTitle",
                                   title, icon);
 }
 
 void NetworkDropdown::ForceNetworkScan() {
   CrosLibrary::Get()->GetNetworkLibrary()->RequestNetworkScan();
   Refresh();
 }
 
 }  // namespace chromeos