chromeos: Remove TrayBubbleView::Delegate::OnBeforeBubbleWidgetInit

ash/system/web_notification/web_notification_tray.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 "ash/system/web_notification/web_notification_tray.h"
 
-#include "ash/public/cpp/shell_window_ids.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 59 matching lines @@
 
 // Class to initialize and manage the WebNotificationBubble and
 // TrayBubbleWrapper instances for a bubble.
 class WebNotificationBubbleWrapper {
  public:
   // Takes ownership of |bubble| and creates |bubble_wrapper_|.
   WebNotificationBubbleWrapper(WebNotificationTray* tray,
                                TrayBackgroundView* anchor_tray,
                                message_center::MessageBubbleBase* bubble) {
     bubble_.reset(bubble);
-    views::TrayBubbleView::AnchorAlignment anchor_alignment =
-        tray->GetAnchorAlignment();
-    views::TrayBubbleView::InitParams init_params =
-        bubble->GetInitParams(anchor_alignment);
-    views::TrayBubbleView* bubble_view = views::TrayBubbleView::Create(
-        anchor_tray->GetBubbleAnchor(), tray, &init_params);
+    views::TrayBubbleView::InitParams init_params;
+    init_params.delegate = tray;
+    init_params.parent_window = anchor_tray->GetBubbleWindowContainer();
+    init_params.anchor_view = anchor_tray->GetBubbleAnchor();
+    init_params.anchor_alignment = tray->GetAnchorAlignment();
+    const int width = message_center::kNotificationWidth +
+                      message_center::kMarginBetweenItems * 2;
+    init_params.min_width = width;
+    init_params.max_width = width;
+    init_params.max_height = bubble->max_height();
+    init_params.can_activate = true;
+    init_params.bg_color = message_center::kBackgroundDarkColor;
+
+    views::TrayBubbleView* bubble_view = new views::TrayBubbleView(init_params);
     bubble_view->set_anchor_view_insets(anchor_tray->GetBubbleAnchorInsets());
     bubble_wrapper_.reset(new TrayBubbleWrapper(tray, bubble_view));
     bubble->InitializeContents(bubble_view);
   }
 
   message_center::MessageBubbleBase* bubble() const { return bubble_.get(); }
 
   // Convenience accessors.
   views::TrayBubbleView* bubble_view() const { return bubble_->bubble_view(); }
 
@@ skipping 343 matching lines @@
 }
 
 void WebNotificationTray::OnMouseEnteredView() {}
 
 void WebNotificationTray::OnMouseExitedView() {}
 
 base::string16 WebNotificationTray::GetAccessibleNameForBubble() {
   return GetAccessibleNameForTray();
 }
 
-void WebNotificationTray::OnBeforeBubbleWidgetInit(
-    views::Widget* anchor_widget,
-    views::Widget* bubble_widget,
-    views::Widget::InitParams* params) const {
-  // Place the bubble in the same root window as |anchor_widget|.
-  RootWindowController::ForWindow(anchor_widget->GetNativeWindow())
-      ->ConfigureWidgetInitParamsForContainer(
-          bubble_widget, kShellWindowId_SettingBubbleContainer, params);
-}
-
 void WebNotificationTray::HideBubble(const views::TrayBubbleView* bubble_view) {
   HideBubbleWithView(bubble_view);
 }
 
 bool WebNotificationTray::ShowNotifierSettings() {
   if (message_center_bubble()) {
     static_cast<message_center::MessageCenterBubble*>(
         message_center_bubble()->bubble())
         ->SetSettingsVisible();
     return true;
@@ skipping 126 matching lines @@
 
 message_center::MessageCenterBubble*
 WebNotificationTray::GetMessageCenterBubbleForTest() {
   if (!message_center_bubble())
     return nullptr;
   return static_cast<message_center::MessageCenterBubble*>(
       message_center_bubble()->bubble());
 }
 
 }  // namespace ash