chromeos: Remove TrayBubbleView::Delegate::OnBeforeBubbleWidgetInit

ui/views/bubble/tray_bubble_view.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/tray_bubble_view.h"
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "cc/paint/paint_flags.h"
@@ skipping 153 matching lines @@
   TrayBubbleView* bubble_view_;
 
   DISALLOW_COPY_AND_ASSIGN(BottomAlignedBoxLayout);
 };
 
 }  // namespace internal
 
 using internal::TrayBubbleContentMask;
 using internal::BottomAlignedBoxLayout;
 
-TrayBubbleView::InitParams::InitParams(AnchorAlignment anchor_alignment,
-                                       int min_width,
-                                       int max_width)
-    : anchor_alignment(anchor_alignment),
-      min_width(min_width),
-      max_width(max_width),
+TrayBubbleView::InitParams::InitParams()
+    : delegate(nullptr),

[msw, 2017/05/30 18:36:04]

optional nit: move member init to the decl?

+      parent_window(nullptr),
+      anchor_view(nullptr),
+      anchor_alignment(ANCHOR_ALIGNMENT_BOTTOM),
+      min_width(0),
+      max_width(0),
       max_height(0),
       can_activate(false),
       close_on_deactivate(true) {}
 
 TrayBubbleView::InitParams::InitParams(const InitParams& other) = default;
 
-// static
-TrayBubbleView* TrayBubbleView::Create(View* anchor,
-                                       Delegate* delegate,
-                                       InitParams* init_params) {
-  return new TrayBubbleView(anchor, delegate, *init_params);
-}
-
-TrayBubbleView::TrayBubbleView(View* anchor,
-                               Delegate* delegate,
-                               const InitParams& init_params)
-    : BubbleDialogDelegateView(anchor,
+TrayBubbleView::TrayBubbleView(const InitParams& init_params)
+    : BubbleDialogDelegateView(init_params.anchor_view,
                                GetArrowAlignment(init_params.anchor_alignment)),
       params_(init_params),
       layout_(new BottomAlignedBoxLayout(this)),
-      delegate_(delegate),
+      delegate_(init_params.delegate),
       preferred_width_(init_params.min_width),
       bubble_border_(new BubbleBorder(
           arrow(),
           BubbleBorder::NO_ASSETS,
           init_params.bg_color.value_or(gfx::kPlaceholderColor))),
       owned_bubble_border_(bubble_border_),
       is_gesture_dragging_(false),
       mouse_actively_entered_(false) {
+  DCHECK(delegate_);
+  DCHECK(params_.parent_window);
+  DCHECK(anchor_widget());  // Computed by BubbleDialogDelegateView().
   bubble_border_->set_use_theme_background_color(!init_params.bg_color);
   bubble_border_->set_alignment(BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE);
   bubble_border_->set_paint_arrow(BubbleBorder::PAINT_NONE);
+  set_parent_window(params_.parent_window);
   set_can_activate(params_.can_activate);
-  DCHECK(anchor_widget());  // Computed by BubbleDialogDelegateView().
   set_notify_enter_exit_on_child(true);
   set_close_on_deactivate(init_params.close_on_deactivate);
   set_margins(gfx::Insets());
   SetPaintToLayer();
 
   bubble_content_mask_.reset(
       new TrayBubbleContentMask(bubble_border_->GetBorderCornerRadius()));
 
   layout_->SetDefaultFlex(1);
   SetLayoutManager(layout_);
@@ skipping 52 matching lines @@
 gfx::Insets TrayBubbleView::GetBorderInsets() const {
   return bubble_border_->GetInsets();
 }
 
 int TrayBubbleView::GetDialogButtons() const {
   return ui::DIALOG_BUTTON_NONE;
 }
 
 void TrayBubbleView::OnBeforeBubbleWidgetInit(Widget::InitParams* params,
                                               Widget* bubble_widget) const {
-  if (delegate_)
-    delegate_->OnBeforeBubbleWidgetInit(anchor_widget(), bubble_widget, params);
   // Apply a WM-provided shadow (see ui/wm/core/).
   params->shadow_type = Widget::InitParams::SHADOW_TYPE_DROP;
   params->shadow_elevation = wm::ShadowElevation::LARGE;
 }
 
 void TrayBubbleView::OnWidgetClosing(Widget* widget) {
   BubbleDialogDelegateView::OnWidgetClosing(widget);
   --g_current_tray_bubble_showing_count_;
   DCHECK_GE(g_current_tray_bubble_showing_count_, 0);
 }
@@ skipping 97 matching lines @@
 
 void TrayBubbleView::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.is_add && details.child == this) {
     details.parent->SetPaintToLayer();
     details.parent->layer()->SetMasksToBounds(true);
   }
 }
 
 }  // namespace views