chromeos: Remove TrayBubbleView::Delegate::OnBeforeBubbleWidgetInit

ui/views/bubble/tray_bubble_view.cc

Index: ui/views/bubble/tray_bubble_view.cc
diff --git a/ui/views/bubble/tray_bubble_view.cc b/ui/views/bubble/tray_bubble_view.cc
index d4d786268d096eecc51d6d1b96f397a3f49b9dc7..4f04167060ceeb97ee2cfe483d665646d8142e9b 100644
--- a/ui/views/bubble/tray_bubble_view.cc
+++ b/ui/views/bubble/tray_bubble_view.cc
@@ -183,14 +183,8 @@ TrayBubbleView::InitParams::InitParams(AnchorAlignment anchor_alignment,
 
 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,
+TrayBubbleView::TrayBubbleView(gfx::NativeWindow parent_window,

[msw, 2017/05/24 18:04:38]

q: Should this be passed in as init_params.parent?

[James Cook, 2017/05/24 18:27:04]

I considered that, but decided to keep InitParams as plain-old data. That means
InitParams doesn't need any validation when it is constructed (like validating
that parent isn't null). But it would work either way - do you want me to change
it?

[msw, 2017/05/24 18:48:36]

I think it's a bit odd to have two parent params; I would prefer one if it
doesn't add much complexity.

+                               View* anchor,
                                Delegate* delegate,
                                const InitParams& init_params)
     : BubbleDialogDelegateView(anchor,
@@ -206,11 +200,13 @@ TrayBubbleView::TrayBubbleView(View* anchor,
       owned_bubble_border_(bubble_border_),
       is_gesture_dragging_(false),
       mouse_actively_entered_(false) {
+  DCHECK(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(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());
@@ -283,8 +279,6 @@ int TrayBubbleView::GetDialogButtons() const {
 
 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;