Revert 64888 - Push for ers:...

chrome/browser/chromeos/login/network_screen.cc

 // Copyright (c) 2010 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/chromeos/login/network_screen.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/string16.h"
@@ skipping 59 matching lines @@
   NetworkLibrary* network = CrosLibrary::Get()->GetNetworkLibrary();
   if (network && network->Connected()) {
     NotifyOnConnection();
   } else {
     continue_pressed_ = true;
     WaitForConnection(network_id_);
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// NetworkLibrary::NetworkManagerObserver implementation:
+// NetworkLibrary::Observer implementation:
 
-void NetworkScreen::OnNetworkManagerChanged(NetworkLibrary* network_lib) {
+void NetworkScreen::NetworkChanged(NetworkLibrary* network_lib) {
   UpdateStatus(network_lib);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // NetworkScreen, ViewScreen implementation:
 
 void NetworkScreen::CreateView() {
   language_switch_menu_.InitLanguageMenu();
   ViewScreen<NetworkSelectionView>::CreateView();
 }
@@ skipping 10 matching lines @@
     help_app_.reset(new HelpAppLauncher(view()->GetNativeWindow()));
   help_app_->ShowHelpTopic(HelpAppLauncher::HELP_CONNECTIVITY);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkScreen, public:
 
 void NetworkScreen::Refresh() {
   if (CrosLibrary::Get()->EnsureLoaded()) {
     SubscribeNetworkNotification();
-    OnNetworkManagerChanged(chromeos::CrosLibrary::Get()->GetNetworkLibrary());
+    NetworkChanged(chromeos::CrosLibrary::Get()->GetNetworkLibrary());
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkScreen, private:
 
 void NetworkScreen::SubscribeNetworkNotification() {
   if (!is_network_subscribed_) {
     is_network_subscribed_ = true;
-    chromeos::CrosLibrary::Get()->GetNetworkLibrary()
-        ->AddNetworkManagerObserver(this);
+    chromeos::CrosLibrary::Get()->GetNetworkLibrary()->AddObserver(this);
   }
 }
 
 void NetworkScreen::UnsubscribeNetworkNotification() {
   if (is_network_subscribed_) {
     is_network_subscribed_ = false;
-    chromeos::CrosLibrary::Get()->GetNetworkLibrary()
-        ->RemoveNetworkManagerObserver(this);
+    chromeos::CrosLibrary::Get()->GetNetworkLibrary()->RemoveObserver(this);
   }
 }
 
 void NetworkScreen::NotifyOnConnection() {
   // TODO(nkostylev): Check network connectivity.
   UnsubscribeNetworkNotification();
   connection_timer_.Stop();
   delegate()->GetObserver(this)->OnExit(ScreenObserver::NETWORK_CONNECTED);
 }
 
@@ skipping 62 matching lines @@
                             &NetworkScreen::OnConnectionTimeout);
   }
 
   network_id_ = network_id;
   view()->ShowConnectingStatus(continue_pressed_, network_id_);
 
   view()->EnableContinue(false);
 }
 
 }  // namespace chromeos