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

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

Issue 2563343002: Remove extension_misc::IsImeMenuExtensionId. (Closed)
Patch Set: Remove kExcludeFromMruKey. Created 4 years 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
« no previous file with comments | « ash/common/wm_window_property.h ('k') | chrome/browser/ui/views/apps/chrome_native_app_window_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc
diff --git a/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc
index 499240c160605e7c3ce8bc45845a76e0cce324a9..7dc75220fc3ad9b0a36a3dadfd01844232c4e7d0 100644
--- a/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc
+++ b/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc
@@ -53,11 +53,8 @@ void ExtensionLauncherContextMenu::Init() {
AddPinMenu();
- if (controller()->IsOpen(item().id) &&
- !extension_misc::IsImeMenuExtensionId(
- controller()->GetAppIDForShelfID(item().id))) {
+ if (controller()->IsOpen(item().id))
AddItemWithStringId(MENU_CLOSE, IDS_LAUNCHER_CONTEXT_MENU_CLOSE);
- }
if (!controller()->IsPlatformApp(item().id) &&
item().type == ash::TYPE_APP_SHORTCUT) {
@@ -95,12 +92,8 @@ void ExtensionLauncherContextMenu::Init() {
}
} else if (item().type == ash::TYPE_DIALOG) {
AddItemWithStringId(MENU_CLOSE, IDS_LAUNCHER_CONTEXT_MENU_CLOSE);
- } else {
- if (controller()->IsOpen(item().id) &&
- !extension_misc::IsImeMenuExtensionId(
- controller()->GetAppIDForShelfID(item().id))) {
- AddItemWithStringId(MENU_CLOSE, IDS_LAUNCHER_CONTEXT_MENU_CLOSE);
- }
+ } else if (controller()->IsOpen(item().id)) {
+ AddItemWithStringId(MENU_CLOSE, IDS_LAUNCHER_CONTEXT_MENU_CLOSE);
}
AddSeparator(ui::NORMAL_SEPARATOR);
if (item().type == ash::TYPE_APP_SHORTCUT || item().type == ash::TYPE_APP) {
« no previous file with comments | « ash/common/wm_window_property.h ('k') | chrome/browser/ui/views/apps/chrome_native_app_window_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698