chromeos: Remove TrayBubbleView::Delegate::OnBeforeBubbleWidgetInit

ui/views/bubble/tray_bubble_view.h

 // 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.
 
 #ifndef UI_VIEWS_BUBBLE_TRAY_BUBBLE_VIEW_H_
 #define UI_VIEWS_BUBBLE_TRAY_BUBBLE_VIEW_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/optional.h"
+#include "ui/gfx/native_widget_types.h"
 #include "ui/views/bubble/bubble_dialog_delegate.h"
 #include "ui/views/mouse_watcher.h"
 #include "ui/views/views_export.h"
 
 namespace views {
 class BoxLayout;
 class View;
 class Widget;
 }
 
@@ skipping 32 matching lines @@
     // Called when the mouse enters/exits the view.
     // Note: This event will only be called if the mouse gets actively moved by
     // the user to enter the view.
     virtual void OnMouseEnteredView() = 0;
     virtual void OnMouseExitedView() = 0;
 
     // Called from GetAccessibleNodeData(); should return the appropriate
     // accessible name for the bubble.
     virtual base::string16 GetAccessibleNameForBubble() = 0;
 
-    // Called before Widget::Init() on |bubble_widget|. Allows |params| to be
-    // modified.
-    // TODO(jamescook): Eliminate this method. It was introduced to let mash set
-    // the widget container back when mash could not use aura::Window. Now the
-    // anchor view should be sufficient.
-    virtual void OnBeforeBubbleWidgetInit(Widget* anchor_widget,
-                                          Widget* bubble_widget,
-                                          Widget::InitParams* params) const = 0;
-
     // Called when a bubble wants to hide/destroy itself (e.g. last visible
     // child view was closed).
     virtual void HideBubble(const TrayBubbleView* bubble_view) = 0;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(Delegate);
   };
 
   struct VIEWS_EXPORT InitParams {
-    InitParams(AnchorAlignment anchor_alignment, int min_width, int max_width);
+    InitParams();
     InitParams(const InitParams& other);
-    AnchorAlignment anchor_alignment;
-    int min_width;
-    int max_width;
-    int max_height;
-    bool can_activate;
-    bool close_on_deactivate;
+    Delegate* delegate = nullptr;
+    gfx::NativeWindow parent_window = nullptr;
+    View* anchor_view = nullptr;
+    AnchorAlignment anchor_alignment = ANCHOR_ALIGNMENT_BOTTOM;
+    int min_width = 0;
+    int max_width = 0;
+    int max_height = 0;
+    bool can_activate = false;
+    bool close_on_deactivate = true;
     // If not provided, the bg color will be derived from the NativeTheme.
     base::Optional<SkColor> bg_color;
   };
 
-  // Constructs and returns a TrayBubbleView. |init_params| may be modified.
-  static TrayBubbleView* Create(views::View* anchor,
-                                Delegate* delegate,
-                                InitParams* init_params);
-
+  explicit TrayBubbleView(const InitParams& init_params);
   ~TrayBubbleView() override;
 
   // Returns whether a tray bubble is active.
   static bool IsATrayBubbleOpen();
 
   // Sets up animations, and show the bubble. Must occur after CreateBubble()
   // is called.
   void InitializeAndShowBubble();
 
   // Called whenever the bubble size or location may have changed.
@@ skipping 36 matching lines @@
   gfx::Size GetMaximumSize() const override;
   int GetHeightForWidth(int width) const override;
   void OnMouseEntered(const ui::MouseEvent& event) override;
   void OnMouseExited(const ui::MouseEvent& event) override;
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
 
   // Overridden from MouseWatcherListener
   void MouseMovedOutOfHost() override;
 
  protected:
-  TrayBubbleView(views::View* anchor,
-                 Delegate* delegate,
-                 const InitParams& init_params);
-
   // Overridden from views::BubbleDialogDelegateView.
   int GetDialogButtons() const override;
 
   // Overridden from views::View.
   void ChildPreferredSizeChanged(View* child) override;
   void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override;
 
  private:
   InitParams params_;
@@ skipping 13 matching lines @@
 
   // Used to find any mouse movements.
   std::unique_ptr<MouseWatcher> mouse_watcher_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayBubbleView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_BUBBLE_TRAY_BUBBLE_VIEW_H_