| 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 54c780ee5ed30055e8a6d42c67a1a705fc95a5e0..425ec2d65b0a7e03d5a86c3c9364b424ed7f4015 100644
|
| --- a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
|
| +++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
|
| @@ -7,7 +7,9 @@
|
| #include <string>
|
|
|
| #include "ash/desktop_background/user_wallpaper_delegate.h"
|
| +#include "ash/root_window_controller.h"
|
| #include "ash/shell.h"
|
| +#include "ash/wm/property_util.h"
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| #include "chrome/browser/extensions/context_menu_matcher.h"
|
| @@ -128,8 +130,13 @@ void LauncherContextMenu::Init() {
|
| }
|
| }
|
| }
|
| - AddCheckItemWithStringId(
|
| - MENU_AUTO_HIDE, IDS_AURA_LAUNCHER_CONTEXT_MENU_AUTO_HIDE);
|
| + // Don't show the auto-hide menu item while in immersive mode because the
|
| + // launcher always auto-hides in this mode and it's confusing when the
|
| + // preference appears not to apply.
|
| + if (!ash::GetRootWindowController(root_window_)->IsImmersiveMode()) {
|
| + AddCheckItemWithStringId(
|
| + MENU_AUTO_HIDE, IDS_AURA_LAUNCHER_CONTEXT_MENU_AUTO_HIDE);
|
| + }
|
| if (CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kShowLauncherAlignmentMenu)) {
|
| AddSubMenuWithStringId(MENU_ALIGNMENT_MENU,
|
|
|