Revert 64888 - Push for ers:...

chrome/browser/chromeos/status/network_menu_button.h

Index: chrome/browser/chromeos/status/network_menu_button.h
===================================================================
--- chrome/browser/chromeos/status/network_menu_button.h	(revision 64888)
+++ chrome/browser/chromeos/status/network_menu_button.h	(working copy)
@@ -46,9 +46,7 @@
 // The label will be BOLD if the network is currently connected.
 class NetworkMenuButton : public StatusAreaButton,
                           public NetworkMenu,
-                          public NetworkLibrary::NetworkManagerObserver,
-                          public NetworkLibrary::NetworkObserver,
-                          public NetworkLibrary::CellularDataPlanObserver {
+                          public NetworkLibrary::Observer {
  public:
   explicit NetworkMenuButton(StatusAreaHost* host);
   virtual ~NetworkMenuButton();
@@ -56,12 +54,9 @@
   // AnimationDelegate implementation.
   virtual void AnimationProgressed(const Animation* animation);
 
-  // NetworkLibrary::NetworkManagerObserver implementation.
-  virtual void OnNetworkManagerChanged(NetworkLibrary* cros);
-  // NetworkLibrary::NetworkObserver implementation.
-  virtual void OnNetworkChanged(NetworkLibrary* cros, const Network* network);
-  // NetworkLibrary::CellularDataPlanObserver implementation.
-  virtual void OnCellularDataPlanChanged(NetworkLibrary* cros);
+  // NetworkLibrary::Observer implementation.
+  virtual void NetworkChanged(NetworkLibrary* obj);
+  virtual void CellularDataPlanChanged(NetworkLibrary* obj);
 
   // Sets the badge icon.
   void SetBadge(const SkBitmap& badge) { badge_ = badge; }
@@ -78,9 +73,6 @@
   virtual bool ShouldOpenButtonOptions() const;
 
  private:
-  void SetNetworkIcon(const Network* network);
-  void SetNetworkBadge(NetworkLibrary* cros, const Network* network);
-
   // The status area host,
   StatusAreaHost* host_;
 
@@ -93,10 +85,6 @@
   // The duration of the icon throbbing in milliseconds.
   static const int kThrobDuration;
 
-  // If any network is currently active, this is the service path of the one
-  // whose status is displayed in the network menu button.
-  std::string active_network_;
-
   DISALLOW_COPY_AND_ASSIGN(NetworkMenuButton);
 };