[Reland][Extensions] Don't count bubble focus loss as acknowledgment

ui/views/bubble/bubble_delegate.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 "ui/views/bubble/bubble_delegate.h"
 
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/geometry/rect.h"
@@ skipping 32 matching lines @@
   if (bubble_params.parent)
     bubble_widget->StackAbove(bubble_params.parent);
   return bubble_widget;
 }
 
 }  // namespace
 
 // static
 const char BubbleDelegateView::kViewClassName[] = "BubbleDelegateView";
 
 BubbleDelegateView::BubbleDelegateView()

[Devlin, 2015/11/18 23:21:27]

Grr... silly duplicate constructors.  We'll fix you!

Now using a delegating constructor so this doesn't happen again.

+    : BubbleDelegateView(nullptr, BubbleBorder::TOP_LEFT) {}
+
+BubbleDelegateView::BubbleDelegateView(View* anchor_view,
+                                       BubbleBorder::Arrow arrow)
     : close_on_esc_(true),
       close_on_deactivate_(true),
       anchor_view_storage_id_(ViewStorage::GetInstance()->CreateStorageID()),
-      anchor_widget_(NULL),
-      arrow_(BubbleBorder::TOP_LEFT),
-      shadow_(BubbleBorder::SMALL_SHADOW),
-      color_explicitly_set_(false),
-      margins_(kDefaultMargin, kDefaultMargin, kDefaultMargin, kDefaultMargin),
-      accept_events_(true),
-      border_accepts_events_(true),
-      adjust_if_offscreen_(true),
-      parent_window_(NULL) {
-  AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
-  UpdateColorsFromTheme(GetNativeTheme());
-}
-
-BubbleDelegateView::BubbleDelegateView(
-    View* anchor_view,
-    BubbleBorder::Arrow arrow)
-    : close_on_esc_(true),
-      close_on_deactivate_(true),
-      anchor_view_storage_id_(ViewStorage::GetInstance()->CreateStorageID()),
       anchor_widget_(NULL),
       arrow_(arrow),
       shadow_(BubbleBorder::SMALL_SHADOW),
       color_explicitly_set_(false),
       margins_(kDefaultMargin, kDefaultMargin, kDefaultMargin, kDefaultMargin),
       accept_events_(true),
       border_accepts_events_(true),
       adjust_if_offscreen_(true),
-      parent_window_(NULL) {
-  SetAnchorView(anchor_view);
+      parent_window_(NULL),
+      close_reason_(CloseReason::UNKNOWN) {
+  if (anchor_view)
+    SetAnchorView(anchor_view);
   AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
   UpdateColorsFromTheme(GetNativeTheme());
 }
 
 BubbleDelegateView::~BubbleDelegateView() {
   if (GetWidget())
     GetWidget()->RemoveObserver(this);
   SetLayoutManager(NULL);
   SetAnchorView(NULL);
 }
@@ skipping 48 matching lines @@
 }
 
 void BubbleDelegateView::GetAccessibleState(ui::AXViewState* state) {
   state->role = ui::AX_ROLE_DIALOG;
 }
 
 const char* BubbleDelegateView::GetClassName() const {
   return kViewClassName;
 }
 
+void BubbleDelegateView::OnWidgetClosing(Widget* widget) {
+  DCHECK(GetBubbleFrameView());
+  if (widget == GetWidget() && close_reason_ == CloseReason::UNKNOWN &&
+      GetBubbleFrameView()->close_button_clicked()) {
+    close_reason_ = CloseReason::CLOSE_BUTTON;
+  }
+}
+
 void BubbleDelegateView::OnWidgetDestroying(Widget* widget) {
   if (anchor_widget() == widget)
     SetAnchorView(NULL);
 }
 
 void BubbleDelegateView::OnWidgetVisibilityChanging(Widget* widget,
                                                     bool visible) {
 #if defined(OS_WIN)
   // On Windows we need to handle this before the bubble is visible or hidden.
   // Please see the comment on the OnWidgetVisibilityChanging function. On
   // other platforms it is fine to handle it after the bubble is shown/hidden.
   HandleVisibilityChanged(widget, visible);
 #endif
 }
 
 void BubbleDelegateView::OnWidgetVisibilityChanged(Widget* widget,
                                                    bool visible) {
 #if !defined(OS_WIN)
   HandleVisibilityChanged(widget, visible);
 #endif
 }
 
 void BubbleDelegateView::OnWidgetActivationChanged(Widget* widget,
                                                    bool active) {
-  if (close_on_deactivate() && widget == GetWidget() && !active)
+  if (close_on_deactivate() && widget == GetWidget() && !active) {
+    if (close_reason_ == CloseReason::UNKNOWN)
+      close_reason_ = CloseReason::DEACTIVATION;
     GetWidget()->Close();
+  }
 }
 
 void BubbleDelegateView::OnWidgetBoundsChanged(Widget* widget,
                                                const gfx::Rect& new_bounds) {
   if (GetBubbleFrameView() && anchor_widget() == widget)
     SizeToContents();
 }
 
 View* BubbleDelegateView::GetAnchorView() const {
   return ViewStorage::GetInstance()->RetrieveView(anchor_view_storage_id_);
@@ skipping 24 matching lines @@
 }
 
 void BubbleDelegateView::OnAnchorBoundsChanged() {
   SizeToContents();
 }
 
 bool BubbleDelegateView::AcceleratorPressed(
     const ui::Accelerator& accelerator) {
   if (!close_on_esc() || accelerator.key_code() != ui::VKEY_ESCAPE)
     return false;
+  close_reason_ = CloseReason::ESCAPE;
   GetWidget()->Close();
   return true;
 }
 
 void BubbleDelegateView::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   UpdateColorsFromTheme(theme);
 }
 
 void BubbleDelegateView::Init() {}
 
@@ skipping 81 matching lines @@
   // http://crbug.com/474622 for details.
   if (widget == GetWidget() && visible) {
     ui::AXViewState state;
     GetAccessibleState(&state);
     if (state.role == ui::AX_ROLE_ALERT_DIALOG)
       NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
   }
 }
 
 }  // namespace views