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

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

Issue 1611463002: Remove the close button in context menu for IME menu. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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/launcher_context_menu.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
index b72aab12ab06d3374ed5ee12ac00b92f1f8737a5..3c4d7cd211dda80b5bc476c5a05f07b88eba9c7d 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
@@ -151,8 +151,19 @@ void LauncherContextMenu::Init() {
l10n_util::GetStringUTF16(IDS_LAUNCHER_CONTEXT_MENU_PIN));
}
if (controller_->IsOpen(item_.id)) {
- AddItem(MENU_CLOSE,
- l10n_util::GetStringUTF16(IDS_LAUNCHER_CONTEXT_MENU_CLOSE));
+ bool add_close_item = true;
+#if defined(OS_CHROMEOS)
stevenjb 2016/01/20 18:03:29 Is there any reason why this needs to be OS_CHROME
Azure Wei 2016/01/21 04:44:54 The IME menu extensions are for Chrome OS only, so
+ // Remove the close item of IME menu in the IME extensions.
+ for (const char* id : extension_misc::kIMEExtensionIds) {
+ if (controller_->GetAppIDForShelfID(item_.id) == id) {
+ add_close_item = false;
+ }
+ }
stevenjb 2016/01/20 18:03:29 This logic really shouldn't be here. We should cre
Azure Wei 2016/01/21 04:44:54 Done.
+#endif
+ if (add_close_item) {
+ AddItem(MENU_CLOSE,
+ l10n_util::GetStringUTF16(IDS_LAUNCHER_CONTEXT_MENU_CLOSE));
+ }
}
}
AddSeparator(ui::NORMAL_SEPARATOR);
« no previous file with comments | « no previous file | chrome/common/extensions/extension_constants.h » ('j') | chrome/common/extensions/extension_constants.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698