Enable the translate bubble to be dismissed when user ignores it.

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 "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/passwords/credentials_item_view.h"
 #include "chrome/browser/ui/views/passwords/credentials_selection_view.h"
 #include "chrome/browser/ui/views/passwords/manage_password_items_view.h"
 #include "chrome/browser/ui/views/passwords/manage_passwords_icon_views.h"
 #include "chrome/grit/generated_resources.h"
-#include "content/public/browser/render_view_host.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/button/blue_button.h"
 #include "ui/views/controls/button/md_text_button.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"
 
 int ManagePasswordsBubbleView::auto_signin_toast_timeout_ = 3;
 
 // Helpers --------------------------------------------------------------------
 
 namespace {
@@ skipping 560 matching lines @@
   if (sender == signin_button_)
     parent_->model()->OnSignInToChromeClicked();
   else if (sender == no_button_)
     parent_->model()->OnSkipSignInClicked();
   else
     NOTREACHED();
 
   parent_->CloseBubble();
 }
 
-// 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);
-
-  void OnKeyEvent(ui::KeyEvent* event) override;
-  void OnMouseEvent(ui::MouseEvent* event) override;
-  void OnTouchEvent(ui::TouchEvent* event) override;
-
- private:
-  ManagePasswordsBubbleView* bubble_;
-  std::unique_ptr<views::EventMonitor> event_monitor_;
-
-  DISALLOW_COPY_AND_ASSIGN(WebContentMouseHandler);
-};
-
-ManagePasswordsBubbleView::WebContentMouseHandler::WebContentMouseHandler(
-    ManagePasswordsBubbleView* bubble)
-    : bubble_(bubble) {
-  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_->web_contents();
-  content::RenderViewHost* rvh = web_contents->GetRenderViewHost();
-  if ((event->key_code() == ui::VKEY_ESCAPE ||
-       rvh->IsFocusedElementEditable()) && event->type() == ui::ET_KEY_PRESSED)
-    bubble_->CloseBubble();
-}
-
-void ManagePasswordsBubbleView::WebContentMouseHandler::OnMouseEvent(
-    ui::MouseEvent* event) {
-  if (event->type() == ui::ET_MOUSE_PRESSED)
-    bubble_->CloseBubble();
-}
-
-void ManagePasswordsBubbleView::WebContentMouseHandler::OnTouchEvent(
-    ui::TouchEvent* event) {
-  if (event->type() == ui::ET_TOUCH_PRESSED)
-    bubble_->CloseBubble();
-}
-
 // ManagePasswordsBubbleView::UpdatePendingView -------------------------------
 
 // A view offering the user the ability to update credentials. Contains a
 // single ManagePasswordItemsView (in case of one credentials) or
 // CredentialsSelectionView otherwise, along with a "Update Passwords" button
 // and a rejection button.
 class ManagePasswordsBubbleView::UpdatePendingView
     : public views::View,
       public views::ButtonListener,
       public views::StyledLabelListener {
@@ skipping 152 matching lines @@
 
 ManagePasswordsBubbleView::ManagePasswordsBubbleView(
     content::WebContents* web_contents,
     views::View* anchor_view,
     DisplayReason reason)
     : LocationBarBubbleDelegateView(anchor_view, web_contents),
       model_(web_contents,
              reason == AUTOMATIC ? ManagePasswordsBubbleModel::AUTOMATIC
                                  : ManagePasswordsBubbleModel::USER_ACTION),
       initially_focused_view_(nullptr) {
-  mouse_handler_.reset(new WebContentMouseHandler(this));
+  mouse_handler_.reset(new WebContentMouseHandler(this, this->web_contents()));
 }
 
 ManagePasswordsBubbleView::~ManagePasswordsBubbleView() {
   if (manage_passwords_bubble_ == this)
     manage_passwords_bubble_ = NULL;
 }
 
 views::View* ManagePasswordsBubbleView::GetInitiallyFocusedView() {
   return initially_focused_view_;
 }
@@ skipping 45 matching lines @@
     AddChildView(new SaveConfirmationView(this));
   } else if (model_.state() == password_manager::ui::AUTO_SIGNIN_STATE) {
     AddChildView(new AutoSigninView(this));
   } else if (model_.state() ==
              password_manager::ui::CHROME_SIGN_IN_PROMO_STATE) {
     AddChildView(new SignInPromoView(this));
   } else {
     AddChildView(new ManageView(this));
   }
 }