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"
@@ skipping 10 matching lines @@
 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;
 
+  // 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,
                        views::BubbleBorder::ArrowLocation arrow_location);
 
   // 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_;
 
   // Child widget to grab the keyboard/mouse input.
   views::Widget* lock_widget_;
 
   // A view that accepts password.
   ScreenLockView* screen_lock_view_;
 
   // A view that can display html page as background.
@@ skipping 38 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_