Index: chrome/browser/ui/views/apps/chrome_native_app_window_views.cc |
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc |
index 9fbe7af5da8828c1c4745aa4dff7a01f1fa42c6c..519c53cecbd6f5eee03706864601c83dd769737e 100644 |
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc |
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc |
@@ -52,6 +52,10 @@ |
#include "ui/aura/window_observer.h" |
#endif |
+#if defined(OS_CHROMEOS) |
+#include "ash/shell_window_ids.h" |
+#endif |
+ |
using extensions::AppWindow; |
namespace { |
@@ -229,6 +233,14 @@ void ChromeNativeAppWindowViews::InitializeDefaultWindow( |
#endif |
OnBeforeWidgetInit(&init_params, widget()); |
+#if defined(OS_CHROMEOS) |
+ if (create_params.is_ime_window) { |
+ // Puts ime windows into ime window container. |
+ init_params.parent = |
+ ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(), |
+ ash::kShellWindowId_ImeWindowParentContainer); |
+ } |
+#endif |
widget()->Init(init_params); |
// The frame insets are required to resolve the bounds specifications |
@@ -257,6 +269,11 @@ void ChromeNativeAppWindowViews::InitializeDefaultWindow( |
wm::SetShadowType(widget()->GetNativeWindow(), wm::SHADOW_TYPE_NONE); |
} |
+#if defined(OS_CHROMEOS) |
+ if (create_params.is_ime_window) |
+ return; |
+#endif |
+ |
// Register accelarators supported by app windows. |
// TODO(jeremya/stevenjb): should these be registered for panels too? |
views::FocusManager* focus_manager = GetFocusManager(); |