| Index: ash/system/web_notification/web_notification_tray.cc
|
| diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc
|
| index ec4a84d448c5aee3795069af313f621b7d827e6b..3a8f9f17a604611e49b0aeda67d7b77b04f4ef90 100644
|
| --- a/ash/system/web_notification/web_notification_tray.cc
|
| +++ b/ash/system/web_notification/web_notification_tray.cc
|
| @@ -4,7 +4,6 @@
|
|
|
| #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"
|
| @@ -88,8 +87,9 @@ class WebNotificationBubbleWrapper {
|
| 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* bubble_view = new views::TrayBubbleView(
|
| + anchor_tray->GetBubbleWindowContainer(), anchor_tray->GetBubbleAnchor(),
|
| + tray, init_params);
|
| bubble_view->set_anchor_view_insets(anchor_tray->GetBubbleAnchorInsets());
|
| bubble_wrapper_.reset(new TrayBubbleWrapper(tray, bubble_view));
|
| bubble->InitializeContents(bubble_view);
|
| @@ -453,16 +453,6 @@ 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);
|
| }
|
|
|