| Index: chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc b/chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc
|
| index f07f122c61831f18f8b09c1f762d8b6473d01707..ac0ae5f5c3c67bc66c3218252f6e352deaa11729 100644
|
| --- a/chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc
|
| +++ b/chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc
|
| @@ -145,6 +145,11 @@ void AppWindowLauncherController::OnWindowActivated(aura::Window* new_active,
|
| }
|
|
|
| void AppWindowLauncherController::RegisterApp(AppWindow* app_window) {
|
| + // Windows created by IME extension should be treated the same way as the
|
| + // virtual keyboard window, which does not register itself in launcher.
|
| + if (app_window->is_ime_window())
|
| + return;
|
| +
|
| aura::Window* window = app_window->GetNativeWindow();
|
| // Get the app's shelf identifier and add an entry to the map.
|
| DCHECK(window_to_app_shelf_id_map_.find(window) ==
|
|
|