Rebase the MessageBubble on the new views bubble.

chrome/browser/chromeos/login/screen_locker_views.h

Index: chrome/browser/chromeos/login/screen_locker_views.h
diff --git a/chrome/browser/chromeos/login/screen_locker_views.h b/chrome/browser/chromeos/login/screen_locker_views.h
index aa6eef8e6c05714eb45dfe06bca06a98d465da25..71431192e9ef5c867c0649754e45f998e2e335a6 100644
--- a/chrome/browser/chromeos/login/screen_locker_views.h
+++ b/chrome/browser/chromeos/login/screen_locker_views.h
@@ -28,9 +28,9 @@ class ScreenLockerTester;
 // shows a BackgroundView and a Signout button as well as creating a
 // ScreenLockView to allow the user to log in.
 class ScreenLockerViews : public ScreenLockerDelegate,
-                          public MessageBubbleDelegate,
                           public CaptchaView::Delegate,
-                          public ui::AcceleratorTarget {
+                          public ui::AcceleratorTarget,
+                          public views::Widget::Observer {
  public:
   // Interface that helps switching from ScreenLockView to CaptchaView.
   class ScreenLockViewContainer {
@@ -67,24 +67,21 @@ class ScreenLockerViews : public ScreenLockerDelegate,
                                           const string16& message) OVERRIDE;
   virtual void ClearErrors() OVERRIDE;
 
-  // Overridden from views::BubbleDelegate.
-  virtual void BubbleClosing(Bubble* bubble, bool closed_by_escape) OVERRIDE;
-  virtual bool CloseOnEscape() OVERRIDE;
-  virtual bool FadeInOnShow() OVERRIDE;
-  virtual void OnLinkActivated(size_t index) OVERRIDE;
+  // views::Widget::Observer implementation:
+  virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE;
 
   // CaptchaView::Delegate implementation:
   virtual void OnCaptchaEntered(const std::string& captcha) OVERRIDE;
 
+  // Called when the window manager is ready to handle locked state.
+  void OnWindowManagerReady();
+
  private:
   friend class LockerInputEventObserver;
   friend class test::ScreenLockerTester;
 
   virtual ~ScreenLockerViews();
 
-  // Called when the window manager is ready to handle locked state.
-  void OnWindowManagerReady();
-
   // Shows error_info_ bubble with the |message| and |arrow_location| specified.
   // Assumes that UI controls were locked before that.
   void ShowErrorBubble(const string16& message,
@@ -93,9 +90,6 @@ class ScreenLockerViews : public ScreenLockerDelegate,
   // Overridden from ui::AcceleratorTarget:
   virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
 
-  // Event handler for client-event.
-  CHROMEGTK_CALLBACK_1(ScreenLockerViews, void, OnClientEvent, GdkEventClient*);
-
   // The screen locker window.
   views::Widget* lock_window_;