Index: ash/system/ime_menu/ime_menu_tray.cc |
diff --git a/ash/system/ime_menu/ime_menu_tray.cc b/ash/system/ime_menu/ime_menu_tray.cc |
index 7e6018be788b95ccaa08f2f3d82ca6cafc1fa25c..2f7a2ce7dc2d54fed608ed5dd1113d6a563c75a8 100644 |
--- a/ash/system/ime_menu/ime_menu_tray.cc |
+++ b/ash/system/ime_menu/ime_menu_tray.cc |
@@ -6,7 +6,6 @@ |
#include "ash/accessibility_delegate.h" |
#include "ash/ash_constants.h" |
-#include "ash/public/cpp/shell_window_ids.h" |
#include "ash/resources/grit/ash_resources.h" |
#include "ash/root_window_controller.h" |
#include "ash/session/session_controller.h" |
@@ -328,8 +327,8 @@ void ImeMenuTray::ShowImeMenuBubbleInternal() { |
init_params.can_activate = true; |
init_params.close_on_deactivate = true; |
- views::TrayBubbleView* bubble_view = |
- views::TrayBubbleView::Create(GetBubbleAnchor(), this, &init_params); |
+ views::TrayBubbleView* bubble_view = new views::TrayBubbleView( |
+ GetBubbleWindowContainer(), GetBubbleAnchor(), this, init_params); |
bubble_view->set_anchor_view_insets(GetBubbleAnchorInsets()); |
// Add a title item with a separator on the top of the IME menu. |
@@ -471,16 +470,6 @@ base::string16 ImeMenuTray::GetAccessibleNameForBubble() { |
return l10n_util::GetStringUTF16(IDS_ASH_IME_MENU_ACCESSIBLE_NAME); |
} |
-void ImeMenuTray::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 ImeMenuTray::HideBubble(const views::TrayBubbleView* bubble_view) { |
HideBubbleWithView(bubble_view); |
} |