| 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 0fcbf0fb26d05f8c193169cca3462654efa55fa9..884a63576e60182175c2c840e6a7c1df93e9bf04 100644
|
| --- a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
|
| +++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
|
| @@ -16,6 +16,7 @@
|
| #include "base/prefs/pref_service.h"
|
| #include "chrome/browser/extensions/context_menu_matcher.h"
|
| #include "chrome/browser/extensions/extension_prefs.h"
|
| +#include "chrome/browser/fullscreen.h"
|
| #include "chrome/browser/prefs/incognito_mode_prefs.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
|
| @@ -134,13 +135,11 @@ void LauncherContextMenu::Init() {
|
| }
|
| }
|
| }
|
| - // 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.
|
| - ash::internal::RootWindowController* root_window_controller =
|
| - ash::GetRootWindowController(root_window_);
|
| - if (root_window_controller != NULL &&
|
| - !root_window_controller->IsImmersiveMode()) {
|
| + // In fullscreen, the launcher is either hidden or autohidden depending on
|
| + // the type of fullscreen. Do not show the auto-hide menu item while in
|
| + // fullscreen because it is confusing when the preference appears not to
|
| + // apply.
|
| + if (!IsFullScreenMode()) {
|
| AddCheckItemWithStringId(
|
| MENU_AUTO_HIDE, IDS_AURA_LAUNCHER_CONTEXT_MENU_AUTO_HIDE);
|
| }
|
|
|