Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(331)

Unified Diff: chrome/browser/ui/ash/launcher/app_window_launcher_controller.cc

Issue 955983004: Do not register IME app window in launcher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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) ==
« no previous file with comments | « no previous file | extensions/browser/app_window/app_window.h » ('j') | extensions/browser/app_window/app_window.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698