Ensure that the first run bubble displays as an inactive bubble window which ensures that it does n…

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"
@@ skipping 14 matching lines @@
 const int kBottomInset = 7;
 const int kRightInset = 2;
 }  // namespace
 
 // static
 FirstRunBubble* FirstRunBubble::ShowBubble(Browser* browser,
                                            views::View* anchor_view) {
   first_run::LogFirstRunMetric(first_run::FIRST_RUN_BUBBLE_SHOWN);
 
   FirstRunBubble* delegate = new FirstRunBubble(browser, anchor_view);
-  views::BubbleDelegateView::CreateBubble(delegate)->Show();
+  views::BubbleDelegateView::CreateBubble(delegate)->ShowInactive();
   return delegate;
 }
 
 void FirstRunBubble::Init() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   const gfx::FontList& original_font_list =
       rb.GetFontList(ui::ResourceBundle::MediumFont);
 
   const base::string16 search_engine_name = browser_ ?
       GetDefaultSearchEngineName(
@@ skipping 27 matching lines @@
   layout->StartRow(0, 0);
   layout->AddView(title);
   layout->AddView(change);
   layout->StartRowWithPadding(0, 0, 0,
       views::kRelatedControlSmallVerticalSpacing);
   layout->AddView(subtext, columns->num_columns(), 1);
 }
 
 FirstRunBubble::FirstRunBubble(Browser* browser, views::View* anchor_view)
     : views::BubbleDelegateView(anchor_view, views::BubbleBorder::TOP_LEFT),
-      browser_(browser) {
+      browser_(browser),
+      bubble_closer_(this, anchor_view) {
   // Compensate for built-in vertical padding in the anchor view's image.
   set_anchor_view_insets(
       gfx::Insets(kAnchorVerticalInset, 0, kAnchorVerticalInset, 0));
 }
 
 FirstRunBubble::~FirstRunBubble() {
 }
 
 void FirstRunBubble::LinkClicked(views::Link* source, int event_flags) {
   first_run::LogFirstRunMetric(first_run::FIRST_RUN_BUBBLE_CHANGE_INVOKED);
 
   GetWidget()->Close();
   if (browser_)
     chrome::ShowSearchEngineSettings(browser_);
 }
+
+FirstRunBubble::FirstRunBubbleCloser::FirstRunBubbleCloser(
+    FirstRunBubble* bubble,
+    views::View* target_view)
+    : bubble_(bubble),
+      target_view_(target_view) {
+  AddKeyboardEventObserver();
+}

[sky, 2015/11/10 22:45:26]

What about if FirstBubbleCloser is destroyed because the bubble closes? Don't
you need to remove keyboard event handelr then?

[ananta, 2015/11/10 23:00:12]

Done.

+
+void FirstRunBubble::FirstRunBubbleCloser::OnKeyEvent(ui::KeyEvent* event) {
+  if (!target_view_)
+    return;
+
+  RemoveKeyboardEventObserver();
+  DCHECK(bubble_);
+  bubble_->GetWidget()->Close();
+  bubble_ = nullptr;
+}
+
+void FirstRunBubble::FirstRunBubbleCloser::AddKeyboardEventObserver() {
+  target_view_->GetWidget()->GetRootView()->AddPreTargetHandler(this);
+}
+
+void FirstRunBubble::FirstRunBubbleCloser::RemoveKeyboardEventObserver() {
+  DCHECK(target_view_);
+  target_view_->GetWidget()->GetRootView()->RemovePreTargetHandler(this);
+  target_view_ = nullptr;
+}