Port BubbleDelegate tests to BubbleDialogDelegate

ui/views/bubble/bubble_dialog_delegate.cc

 // Copyright 2016 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_dialog_delegate.h"
 
 #include "build/build_config.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_utils.h"
@@ skipping 105 matching lines @@
 }
 
 void BubbleDialogDelegateView::GetAccessibleState(ui::AXViewState* state) {
   state->role = ui::AX_ROLE_DIALOG;
 }
 
 const char* BubbleDialogDelegateView::GetClassName() const {
   return kViewClassName;
 }
 
-void BubbleDialogDelegateView::OnWidgetClosing(Widget* widget) {
-  DCHECK(GetBubbleFrameView());
-  if (widget == GetWidget() && close_reason_ == CloseReason::UNKNOWN &&
-      GetBubbleFrameView()->close_button_clicked()) {
-    close_reason_ = CloseReason::CLOSE_BUTTON;
-  }
-}
-
 void BubbleDialogDelegateView::OnWidgetDestroying(Widget* widget) {
   if (anchor_widget() == widget)
     SetAnchorView(NULL);
 }
 
 void BubbleDialogDelegateView::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 BubbleDialogDelegateView::OnWidgetVisibilityChanged(Widget* widget,
                                                          bool visible) {
 #if !defined(OS_WIN)
   HandleVisibilityChanged(widget, visible);
 #endif
 }
 
 void BubbleDialogDelegateView::OnWidgetActivationChanged(Widget* widget,
                                                          bool active) {
-  if (close_on_deactivate() && widget == GetWidget() && !active) {
-    if (close_reason_ == CloseReason::UNKNOWN)
-      close_reason_ = CloseReason::DEACTIVATION;
+  if (close_on_deactivate() && widget == GetWidget() && !active)
     GetWidget()->Close();
-  }
 }
 
 void BubbleDialogDelegateView::OnWidgetBoundsChanged(
     Widget* widget,
     const gfx::Rect& new_bounds) {
   if (GetBubbleFrameView() && anchor_widget() == widget)
     SizeToContents();
 }
 
 View* BubbleDialogDelegateView::GetAnchorView() const {
@@ skipping 45 matching lines @@
       arrow_(arrow),
       shadow_(BubbleBorder::SMALL_SHADOW),
       color_explicitly_set_(false),
       margins_(kPanelVertMargin,
                kPanelHorizMargin,
                kPanelVertMargin,
                kPanelHorizMargin),
       accept_events_(true),
       border_accepts_events_(true),
       adjust_if_offscreen_(true),
-      parent_window_(NULL),
-      close_reason_(CloseReason::UNKNOWN) {
+      parent_window_(NULL) {
   if (anchor_view)
     SetAnchorView(anchor_view);
   UpdateColorsFromTheme(GetNativeTheme());
 }
 
 gfx::Rect BubbleDialogDelegateView::GetBubbleBounds() {
   // The argument rect has its origin at the bubble's arrow anchor point;
   // its size is the preferred size of the bubble's client view (this view).
   bool anchor_minimized = anchor_widget() && anchor_widget()->IsMinimized();
   return GetBubbleFrameView()->GetUpdatedWindowBounds(
@@ skipping 82 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