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..5ab8411b1c8de73c7f887ec1963c881f9c285178 100644 |
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc |
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc |
@@ -86,7 +86,8 @@ void LauncherContextMenu::Init() { |
l10n_util::GetStringUTF16(IDS_LAUNCHER_CONTEXT_MENU_CLOSE)); |
} |
if (!controller_->IsPlatformApp(item_.id) && |
- item_.type != ash::TYPE_WINDOWED_APP) { |
+ item_.type != ash::TYPE_WINDOWED_APP && |
+ !ash::Shell::IsForcedMaximizeMode()) { |
James Cook
2013/04/22 22:15:46
Don't you want to do this below, not here?
Mr4D (OOO till 08-26)
2013/04/23 04:41:28
Good catch! There was a fore and back on this one.
|
AddSeparator(ui::NORMAL_SEPARATOR); |
AddCheckItemWithStringId( |
LAUNCH_TYPE_REGULAR_TAB, |
@@ -94,14 +95,16 @@ void LauncherContextMenu::Init() { |
AddCheckItemWithStringId( |
LAUNCH_TYPE_PINNED_TAB, |
IDS_APP_CONTEXT_MENU_OPEN_PINNED); |
- AddCheckItemWithStringId( |
- LAUNCH_TYPE_WINDOW, |
- IDS_APP_CONTEXT_MENU_OPEN_WINDOW); |
- // Even though the launch type is Full Screen it is more accurately |
- // described as Maximized in Ash. |
- AddCheckItemWithStringId( |
- LAUNCH_TYPE_FULLSCREEN, |
- IDS_APP_CONTEXT_MENU_OPEN_MAXIMIZED); |
+ if (!ash::Shell::IsForcedMaximizeMode()) { |
+ AddCheckItemWithStringId( |
+ LAUNCH_TYPE_WINDOW, |
+ IDS_APP_CONTEXT_MENU_OPEN_WINDOW); |
+ // Even though the launch type is Full Screen it is more accurately |
+ // described as Maximized in Ash. |
+ AddCheckItemWithStringId( |
+ LAUNCH_TYPE_FULLSCREEN, |
+ IDS_APP_CONTEXT_MENU_OPEN_MAXIMIZED); |
+ } |
} |
} else if (item_.type == ash::TYPE_BROWSER_SHORTCUT) { |
AddItem(MENU_NEW_WINDOW, |