MacViews: Implement event monitoring for a specific window (Reland)

chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc

 // Copyright 2013 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/ui/views/passwords/manage_passwords_bubble_view.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h"
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
 #include "chrome/browser/ui/passwords/save_password_refusal_combobox_model.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/passwords/credentials_item_view.h"
 #include "chrome/browser/ui/views/passwords/manage_password_items_view.h"
 #include "chrome/browser/ui/views/passwords/manage_passwords_icon_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
-#include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/button/blue_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/controls/styled_label_listener.h"
+#include "ui/views/event_monitor.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 
 // Helpers --------------------------------------------------------------------
 
 namespace {
 
@@ skipping 863 matching lines @@
 }
 
 // ManagePasswordsBubbleView::WebContentMouseHandler --------------------------
 
 // The class listens for WebContentsView events and notifies the bubble if the
 // view was clicked on or received keystrokes.
 class ManagePasswordsBubbleView::WebContentMouseHandler
     : public ui::EventHandler {
  public:
   explicit WebContentMouseHandler(ManagePasswordsBubbleView* bubble);
-  ~WebContentMouseHandler() override;
 
   void OnKeyEvent(ui::KeyEvent* event) override;
   void OnMouseEvent(ui::MouseEvent* event) override;
 
  private:
-  aura::Window* GetWebContentsWindow();
-
   ManagePasswordsBubbleView* bubble_;
+  scoped_ptr<views::EventMonitor> event_monitor_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentMouseHandler);
 };
 
 ManagePasswordsBubbleView::WebContentMouseHandler::WebContentMouseHandler(
     ManagePasswordsBubbleView* bubble)
     : bubble_(bubble) {
-  GetWebContentsWindow()->AddPreTargetHandler(this);
-}
-
-ManagePasswordsBubbleView::WebContentMouseHandler::~WebContentMouseHandler() {
-  if (aura::Window* window = GetWebContentsWindow())
-    window->RemovePreTargetHandler(this);
+  content::WebContents* web_contents = bubble_->web_contents();
+  DCHECK(web_contents);
+  event_monitor_ = views::EventMonitor::CreateWindowMonitor(
+      this, web_contents->GetTopLevelNativeWindow());
 }
 
 void ManagePasswordsBubbleView::WebContentMouseHandler::OnKeyEvent(
     ui::KeyEvent* event) {
-  content::WebContents* web_contents = bubble_->model()->web_contents();
+  content::WebContents* web_contents = bubble_->web_contents();
   content::RenderViewHost* rvh = web_contents->GetRenderViewHost();
   if (rvh->IsFocusedElementEditable() &&
       event->type() == ui::ET_KEY_PRESSED)
     bubble_->Close();
 }
 
 void ManagePasswordsBubbleView::WebContentMouseHandler::OnMouseEvent(
     ui::MouseEvent* event) {
   if (event->type() == ui::ET_MOUSE_PRESSED)
     bubble_->Close();
 }
 
-aura::Window*
-ManagePasswordsBubbleView::WebContentMouseHandler::GetWebContentsWindow() {
-  content::WebContents* web_contents = bubble_->model()->web_contents();
-  return web_contents ? web_contents->GetNativeView() : NULL;
-}
-
 // ManagePasswordsBubbleView --------------------------------------------------
 
 // static
 ManagePasswordsBubbleView* ManagePasswordsBubbleView::manage_passwords_bubble_ =
     NULL;
 
 // static
 void ManagePasswordsBubbleView::ShowBubble(content::WebContents* web_contents,
                                            DisplayReason reason) {
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
   DCHECK(browser);
   DCHECK(browser->window());
   DCHECK(browser->fullscreen_controller());
 
   if (IsShowing())
     return;
 
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
   bool is_fullscreen = browser_view->IsFullscreen();
   ManagePasswordsIconView* anchor_view =
       is_fullscreen
           ? NULL
           : browser_view->GetLocationBarView()->manage_passwords_icon_view();
   manage_passwords_bubble_ = new ManagePasswordsBubbleView(
       web_contents, anchor_view, reason);
 
-  if (is_fullscreen) {
-    manage_passwords_bubble_->set_parent_window(
-        web_contents->GetTopLevelNativeWindow());
-  }
+  if (is_fullscreen)
+    manage_passwords_bubble_->set_parent_window(web_contents->GetNativeView());
 
   views::BubbleDelegateView::CreateBubble(manage_passwords_bubble_);
 
   // Adjust for fullscreen after creation as it relies on the content size.
   if (is_fullscreen) {
     manage_passwords_bubble_->AdjustForFullscreen(
         browser_view->GetBoundsInScreen());
   }
   if (reason == AUTOMATIC)
     manage_passwords_bubble_->GetWidget()->ShowInactive();
@@ skipping 141 matching lines @@
 }
 
 void ManagePasswordsBubbleView::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(type, chrome::NOTIFICATION_FULLSCREEN_CHANGED);
   GetWidget()->SetVisibilityAnimationTransition(views::Widget::ANIMATE_NONE);
   CloseBubble();
 }