Chromium Code Reviews| 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 18765b787549a89f94b9773205bb0a61688f8397..4c1a9fb225a546e480729137bef14611ee3a9106 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 |
| @@ -51,6 +51,10 @@ |
| #include "ui/aura/window_observer.h" |
| #endif |
| +#if defined(OS_CHROMEOS) |
|
benwells
2014/09/11 19:35:10
what about ash on windows etc.? It doesn't seem li
bshe
2014/09/11 22:35:59
IME api and the component extensions are not avail
|
| +#include "ash/shell_window_ids.h" |
| +#endif |
| + |
| using extensions::AppWindow; |
| namespace { |
| @@ -226,6 +230,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 |
| @@ -254,6 +266,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(); |