Revert 64888 - Push for ers:...

chrome/browser/chromeos/dom_ui/internet_options_handler.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_DOM_UI_INTERNET_OPTIONS_HANDLER_H_
 #define CHROME_BROWSER_CHROMEOS_DOM_UI_INTERNET_OPTIONS_HANDLER_H_
 
 #include <string>
 
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/dom_ui/options/options_ui.h"
 
 class SkBitmap;
 namespace views {
 class WindowDelegate;
 }
 
 // ChromeOS internet options page UI handler.
-class InternetOptionsHandler
-  : public OptionsPageUIHandler,
-    public chromeos::NetworkLibrary::NetworkManagerObserver,
-    public chromeos::NetworkLibrary::NetworkObserver,
-    public chromeos::NetworkLibrary::CellularDataPlanObserver {
-
+class InternetOptionsHandler : public OptionsPageUIHandler,
+                               public chromeos::NetworkLibrary::Observer {
  public:
   InternetOptionsHandler();
   virtual ~InternetOptionsHandler();
 
   // OptionsUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings);
 
   // DOMMessageHandler implementation.
   virtual void RegisterMessages();
 
-  // NetworkLibrary::NetworkManagerObserver implementation.
-  virtual void OnNetworkManagerChanged(chromeos::NetworkLibrary* network_lib);
-  // NetworkLibrary::NetworkObserver implementation.
-  virtual void OnNetworkChanged(chromeos::NetworkLibrary* network_lib,
-                                const chromeos::Network* network);
-  // NetworkLibrary::CellularDataPlanObserver implementation.
-  virtual void OnCellularDataPlanChanged(chromeos::NetworkLibrary* network_lib);
+  // NetworkLibrary::Observer implementation.
+  virtual void NetworkChanged(chromeos::NetworkLibrary* obj);
+  virtual void CellularDataPlanChanged(chromeos::NetworkLibrary* obj);
 
  private:
   // Passes data needed to show details overlay for network.
   // |args| will be [ network_type, service_path, command ]
   // And command is one of 'options', 'connect', disconnect', or 'forget'
   void ButtonClickCallback(const ListValue* args);
   // Initiates cellular plan data refresh. The results from libcros will
   // be passed through CellularDataPlanChanged() callback method.
   // |args| will be [ service_path ]
   void RefreshCellularPlanCallback(const ListValue* args);
@@ skipping 30 matching lines @@
       const std::string& name, bool connecting, bool connected,
       chromeos::ConnectionType connection_type, bool remembered,
       chromeos::ActivationState activation_state);
 
   // Creates the map of wired networks
   ListValue* GetWiredList();
   // Creates the map of wireless networks
   ListValue* GetWirelessList();
   // Creates the map of remembered networks
   ListValue* GetRememberedList();
-  // Refresh the display of network information
-  void RefreshNetworkData(chromeos::NetworkLibrary* cros);
-  // Monitor the active network, if any
-  void MonitorActiveNetwork(chromeos::NetworkLibrary* cros);
-
-  // If any network is currently active, this is its service path
-  std::string active_network_;
 
   DISALLOW_COPY_AND_ASSIGN(InternetOptionsHandler);
 };
 
 #endif  // CHROME_BROWSER_CHROMEOS_DOM_UI_INTERNET_OPTIONS_HANDLER_H_