Fix a regression caused by my change to make the first run bubble window display as an inactive win…

chrome/browser/ui/views/first_run_bubble.cc

 // Copyright (c) 2012 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/first_run_bubble.h"
 
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/search_engines/util.h"
+#include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 const int kAnchorVerticalInset = 5;
@@ skipping 73 matching lines @@
   GetWidget()->Close();
   if (browser_)
     chrome::ShowSearchEngineSettings(browser_);
 }
 
 FirstRunBubble::FirstRunBubbleCloser::FirstRunBubbleCloser(
     FirstRunBubble* bubble,
     views::View* anchor_view)
     : bubble_(bubble),
       anchor_widget_(anchor_view->GetWidget()) {
-  AddKeyboardEventObserver();
+  AddEventObservers();
 }
 
 FirstRunBubble::FirstRunBubbleCloser::~FirstRunBubbleCloser() {
   if (anchor_widget_)
-    RemoveKeyboardEventObserver();
+    RemoveEventObservers();
 }
 
 void FirstRunBubble::FirstRunBubbleCloser::OnKeyEvent(ui::KeyEvent* event) {
+  CloseBubble();
+}
+
+void FirstRunBubble::FirstRunBubbleCloser::OnMouseEvent(
+    ui::MouseEvent* event) {
+  if (event->type() == ui::ET_MOUSE_PRESSED)
+    CloseBubble();
+}
+
+void FirstRunBubble::FirstRunBubbleCloser::OnGestureEvent(
+    ui::GestureEvent* event) {
+  if (event->type() == ui::ET_GESTURE_TAP ||
+      event->type() == ui::ET_GESTURE_TAP_DOWN) {
+    CloseBubble();
+  }
+}
+
+void FirstRunBubble::FirstRunBubbleCloser::AddEventObservers() {
+  anchor_widget_->GetNativeView()->AddPreTargetHandler(this);
+}
+
+void FirstRunBubble::FirstRunBubbleCloser::RemoveEventObservers() {
+  DCHECK(anchor_widget_);
+  anchor_widget_->GetNativeView()->RemovePreTargetHandler(this);
+  anchor_widget_ = nullptr;
+}
+
+void FirstRunBubble::FirstRunBubbleCloser::CloseBubble() {
   if (!anchor_widget_)
     return;
 
-  RemoveKeyboardEventObserver();
+  RemoveEventObservers();
   DCHECK(bubble_);
   bubble_->GetWidget()->Close();
   bubble_ = nullptr;
 }
-
-void FirstRunBubble::FirstRunBubbleCloser::AddKeyboardEventObserver() {
-  anchor_widget_->GetRootView()->AddPreTargetHandler(this);
-}
-
-void FirstRunBubble::FirstRunBubbleCloser::RemoveKeyboardEventObserver() {
-  DCHECK(anchor_widget_);
-  anchor_widget_->GetRootView()->RemovePreTargetHandler(this);
-  anchor_widget_ = nullptr;
-}