Revert 64888 - Push for ers:...

chrome/browser/chromeos/status/network_menu_button.h

 // Copyright (c) 2006-2008 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_STATUS_NETWORK_MENU_BUTTON_H_
 #define CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_BUTTON_H_
 #pragma once
 
 #include "app/throb_animation.h"
 #include "base/timer.h"
@@ skipping 28 matching lines @@
 //         Disable Wifi
 //         Disable Celluar
 // --------------------------------
 //         <IP Address>
 //         Network settings...
 //
 // <icon> will show the strength of the wifi/cellular networks.
 // 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();
 
   // 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; }
   SkBitmap badge() const { return badge_; }
 
  protected:
   // StatusAreaButton implementation.
   virtual void DrawIcon(gfx::Canvas* canvas);
 
   // NetworkMenu implementation:
   virtual bool IsBrowserMode() const;
   virtual gfx::NativeWindow GetNativeWindow() const;
   virtual void OpenButtonOptions() const;
   virtual bool ShouldOpenButtonOptions() const;
 
  private:
-  void SetNetworkIcon(const Network* network);
-  void SetNetworkBadge(NetworkLibrary* cros, const Network* network);
-
   // The status area host,
   StatusAreaHost* host_;
 
   // A badge icon displayed on top of the icon.
   SkBitmap badge_;
 
   // The throb animation that does the wifi connecting animation.
   ThrobAnimation animation_connecting_;
 
   // 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);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_BUTTON_H_