Rebase the MessageBubble on the new views bubble.

chrome/browser/chromeos/login/screen_locker_views.cc

 // 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.
 
 #include "chrome/browser/chromeos/login/screen_locker_views.h"
 
 #include <X11/extensions/XTest.h>
 #include <X11/keysym.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
@@ skipping 13 matching lines @@
 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
 #include "chrome/browser/chromeos/view_ids.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/user_metrics.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/screen.h"
+#include "views/controls/textfield/textfield.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
+#include "ui/views/widget/native_widget_gtk.h"
 #endif
 
 namespace {
 
 // The active ScreenLockerDelegate.
 chromeos::ScreenLockerViews* screen_locker_view_ = NULL;
 
 // The maximum duration for which locker should try to grab the keyboard and
 // mouse and its interval for regrabbing on failure.
 const int kMaxGrabFailureSec = 30;
@@ skipping 753 matching lines @@
   screen_lock_view_->SetVisible(false);
   grab_container_->SetScreenLockView(captcha_view_);
   background_container_->SetScreenLockView(captcha_view_);
   captcha_view_->SetVisible(true);
   // Take ScreenLockView ownership now that it's removed from grab_container_.
   secondary_view_.reset(screen_lock_view_);
 }
 
 void ScreenLockerViews::ClearErrors() {
   if (error_info_) {
-    error_info_->Close();
+    error_info_->GetWidget()->Close();
     error_info_ = NULL;
   }
 }
 
-void ScreenLockerViews::BubbleClosing(Bubble* bubble, bool closed_by_escape) {
+void ScreenLockerViews::OnWidgetClosing(views::Widget* widget) {
+  if (!error_info_ || error_info_->GetWidget() != widget)
+    return;
+
   error_info_ = NULL;
   SetSignoutEnabled(true);
   if (mouse_event_relay_.get()) {
     MessageLoopForUI::current()->RemoveObserver(mouse_event_relay_.get());
     mouse_event_relay_.reset();
   }
 }
 
-bool ScreenLockerViews::CloseOnEscape() {
-  return true;
-}
-
-bool ScreenLockerViews::FadeInOnShow() {
-  return false;
-}
-
-void ScreenLockerViews::OnLinkActivated(size_t index) {
-}
-
 void ScreenLockerViews::OnCaptchaEntered(const std::string& captcha) {
   // Captcha dialog is only shown when LoginPerformer instance exists,
   // i.e. blocking UI after password change is in place.
   DCHECK(LoginPerformer::default_performer());
   LoginPerformer::default_performer()->set_captcha(captcha);
 
   // ScreenLockView ownership is passed to grab_container_.
   // Need to save return value here so that compile
   // doesn't fail with "unused result" warning.
   ignore_result(secondary_view_.release());
@@ skipping 32 matching lines @@
 void ScreenLockerViews::OnWindowManagerReady() {
   DVLOG(1) << "OnClientEvent: drawn for lock";
   drawn_ = true;
   if (input_grabbed_)
     ScreenLockReady();
 }
 
 void ScreenLockerViews::ShowErrorBubble(
     const string16& message,
     views::BubbleBorder::ArrowLocation arrow_location) {
-  if (error_info_)
-    error_info_->Close();
+  ClearErrors();
 
-  gfx::Rect rect = screen_lock_view_->GetPasswordBoundsRelativeTo(
-      lock_widget_->GetRootView());
-  gfx::Rect lock_widget_bounds = lock_widget_->GetClientAreaScreenBounds();
-  rect.Offset(lock_widget_bounds.x(), lock_widget_bounds.y());
-  error_info_ = MessageBubble::ShowNoGrab(
-      lock_window_,
-      rect,
+  // TODO(nkostylev): Add help link.
+  std::vector<string16> help_links;
+  error_info_ = new MessageBubble(
+      screen_lock_view_->password_field(),
       arrow_location,
       ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING),
-      UTF16ToWide(message),
-      UTF16ToWide(string16()),  // TODO(nkostylev): Add help link.
-      this);
+      message,
+      help_links);
+  MessageBubble::ShowBubble(error_info_);
+  error_info_->GetWidget()->AddObserver(this);
 
 #if !defined(TOUCH_UI)
   if (mouse_event_relay_.get())
     MessageLoopForUI::current()->RemoveObserver(mouse_event_relay_.get());
+  // TODO(oshima|msw): Investigate MouseEventRelay problems: crosbug.com/23324.
   mouse_event_relay_.reset(
       new MouseEventRelay(lock_widget_->GetNativeView()->window,
-                          error_info_->GetNativeView()->window));
+                          error_info_->GetWidget()->GetNativeView()->window));
   MessageLoopForUI::current()->AddObserver(mouse_event_relay_.get());
 #endif
 }
 
 bool ScreenLockerViews::AcceleratorPressed(
     const ui::Accelerator& accelerator) {
   if (!background_view_->IsScreenSaverVisible()) {
     screen_locker_view_->StartScreenSaver();
     return true;
   }
   return false;
 }
 
 void ScreenLockerViews::OnClientEvent(GtkWidget* widge, GdkEventClient* event) {
 #if defined(TOOLKIT_USES_GTK)
   WmIpc::Message msg;
   WmIpc::instance()->DecodeMessage(*event, &msg);
   if (msg.type() == WM_IPC_MESSAGE_CHROME_NOTIFY_SCREEN_REDRAWN_FOR_LOCK) {
     OnWindowManagerReady();
   }
 #endif
 }
 
 }  // namespace chromeos