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

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: Move the helper funciton below the constants. 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..07e5aad1483555281d2fcc95e0309c3852434a90 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
@@ -151,8 +151,15 @@ 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 show_close_button = true;
stevenjb 2016/01/29 17:53:27 nit (sorry, I didn't notice this before) this coul
Azure Wei 2016/01/30 09:04:13 Done. Thank you for pointing this out.
+#if defined(OS_CHROMEOS)
+ if (extension_misc::IsImeMenuExtensionId(
+ controller_->GetAppIDForShelfID(item_.id)))
+ show_close_button = false;
stevenjb 2016/01/29 17:53:27 nit: {}
Azure Wei 2016/01/30 09:04:13 Done.
+#endif
+ if (show_close_button)
+ AddItem(MENU_CLOSE,
+ l10n_util::GetStringUTF16(IDS_LAUNCHER_CONTEXT_MENU_CLOSE));
stevenjb 2016/01/29 17:53:27 {}
Azure Wei 2016/01/30 09:04:13 Done.
}
}
AddSeparator(ui::NORMAL_SEPARATOR);
« no previous file with comments | « no previous file | chrome/common/extensions/extension_constants.h » ('j') | chrome/common/extensions/extension_constants.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698