Rebase the MessageBubble on the new views bubble.

chrome/browser/chromeos/status/network_menu_button.h

 // Copyright (c) 2011 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 <string>
 
@@ skipping 36 matching lines @@
 // <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 views::ViewMenuDelegate,
                           public NetworkMenu::Delegate,
                           public NetworkMenuIcon::Delegate,
                           public NetworkLibrary::NetworkDeviceObserver,
                           public NetworkLibrary::NetworkManagerObserver,
                           public NetworkLibrary::NetworkObserver,
                           public NetworkLibrary::CellularDataPlanObserver,
-                          public MessageBubbleDelegate {
+                          public views::Widget::Observer,
+                          public MessageBubbleLinkListener {
  public:
   explicit NetworkMenuButton(StatusAreaButton::Delegate* delegate,
                              StatusAreaViewChromeos::ScreenMode screen_mode);
   virtual ~NetworkMenuButton();
 
   static void RegisterPrefs(PrefService* local_state);
 
   // NetworkLibrary::NetworkDeviceObserver implementation.
   virtual void OnNetworkDeviceChanged(NetworkLibrary* cros,
                                       const NetworkDevice* device) OVERRIDE;
@@ skipping 16 matching lines @@
 
   // NetworkMenuIcon::Delegate implementation:
   virtual void NetworkMenuIconChanged() OVERRIDE;
 
   // views::View
   virtual void OnLocaleChanged() OVERRIDE;
 
   // views::ViewMenuDelegate implementation.
   virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE;
 
-  // MessageBubbleDelegate implementation:
-  virtual void BubbleClosing(Bubble* bubble, bool closed_by_escape) OVERRIDE;
-  virtual bool CloseOnEscape() OVERRIDE;
-  virtual bool FadeInOnShow() OVERRIDE;
+  // views::Widget::Observer implementation:
+  virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE;
+
+  // MessageBubbleLinkListener implementation:
   virtual void OnLinkActivated(size_t index) OVERRIDE;
 
  private:
   // Returns carrier info.
   const MobileConfig::Carrier* GetCarrier(NetworkLibrary* cros);
 
   // Returns carrier deal if it's specified and should be shown,
   // otherwise returns NULL.
   const MobileConfig::CarrierDeal* GetCarrierDeal(
       const MobileConfig::Carrier* carrier);
@@ skipping 49 matching lines @@
 
   // Factory for delaying showing promo notification.
   base::WeakPtrFactory<NetworkMenuButton> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkMenuButton);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_BUTTON_H_