Rebase the MessageBubble on the new views bubble.

chrome/browser/chromeos/login/screen_locker_views.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_LOGIN_SCREEN_LOCKER_VIEWS_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREEN_LOCKER_VIEWS_H_
 #pragma once
 
 #include "chrome/browser/chromeos/login/captcha_view.h"
 #include "chrome/browser/chromeos/login/message_bubble.h"
 #include "chrome/browser/chromeos/login/screen_locker_delegate.h"
 
+#if defined(TOOLKIT_USES_GTK)
+#include "ui/base/gtk/gtk_signal.h"
+#endif
+
 namespace chromeos {
 
 class BackgroundView;
 class InputEventObserver;
 class LockerInputEventObserver;
 class MessageBubble;
 class MouseEventRelay;
 class ScreenLocker;
 class ScreenLockView;
 
 namespace test {
 class ScreenLockerTester;
 }
 
 // This version of ScreenLockerDelegate displays a views interface. This class
 // 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 {
    public:
     virtual void SetScreenLockView(views::View* screen_lock_view) = 0;
 
    protected:
     virtual ~ScreenLockViewContainer();
   };
 
@@ skipping 16 matching lines @@
   virtual void ScreenLockReady() OVERRIDE;
   virtual void OnAuthenticate() OVERRIDE;
   virtual void SetInputEnabled(bool enabled) OVERRIDE;
   virtual void SetSignoutEnabled(bool enabled) OVERRIDE;
   virtual void ShowErrorMessage(const string16& message,
                                 bool sign_out_only) OVERRIDE;
   virtual void ShowCaptchaAndErrorMessage(const GURL& captcha_url,
                                           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;
 
  private:
   friend class LockerInputEventObserver;
   friend class test::ScreenLockerTester;
 
   virtual ~ScreenLockerViews();
 
@@ skipping 62 matching lines @@
 
   // True if both mouse input and keyboard input are grabbed.
   bool input_grabbed_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenLockerViews);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREEN_LOCKER_VIEWS_H_