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

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

Issue 134653005: Don't show the Autohide Shelf menu option when it's unsupported. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Don't show the Autohide shelf option when it's unsupported. Created 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 36d7d6e272bb32a370cf8e9de43ee757a34d8b03..1ffa79c149b2143b0f48e90d7c9971c70e9066e7 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
@@ -171,8 +171,12 @@ void LauncherContextMenu::Init() {
// fullscreen because it is confusing when the preference appears not to
// apply.
if (!IsFullScreenMode()) {
- AddCheckItemWithStringId(MENU_AUTO_HIDE,
- IDS_ASH_SHELF_CONTEXT_MENU_AUTO_HIDE);
+ if ((controller_->GetShelfAutoHideBehavior(root_window_) !=
+ ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER) ||
Mr4D (OOO till 08-26) 2014/01/10 21:55:34 Please remove the first check. since that is not n
+ controller_->CanUserModifyShelfAutoHideBehavior(root_window_)) {
+ AddCheckItemWithStringId(MENU_AUTO_HIDE,
+ IDS_ASH_SHELF_CONTEXT_MENU_AUTO_HIDE);
+ }
}
if (ash::ShelfWidget::ShelfAlignmentAllowed()) {
AddSubMenuWithStringId(MENU_ALIGNMENT_MENU,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698