| Index: chrome/browser/ui/app_list/extension_app_item.cc
|
| diff --git a/chrome/browser/ui/app_list/extension_app_item.cc b/chrome/browser/ui/app_list/extension_app_item.cc
|
| index 7b4501d7656f7c0694367d7afe14bdcf189559cc..441d6cf51978e0150972664c7bfa6a9009797756 100644
|
| --- a/chrome/browser/ui/app_list/extension_app_item.cc
|
| +++ b/chrome/browser/ui/app_list/extension_app_item.cc
|
| @@ -37,6 +37,10 @@
|
| #include "ui/gfx/image/canvas_image_source.h"
|
| #include "ui/gfx/image/image_skia_operations.h"
|
|
|
| +#if defined(USE_ASH)
|
| +#include "ash/shell.h"
|
| +#endif
|
| +
|
| using extensions::Extension;
|
|
|
| namespace {
|
| @@ -563,15 +567,19 @@ ui::MenuModel* ExtensionAppItem::GetContextMenuModel() {
|
| context_menu_model_->AddCheckItemWithStringId(
|
| LAUNCH_TYPE_PINNED_TAB,
|
| IDS_APP_CONTEXT_MENU_OPEN_PINNED);
|
| - context_menu_model_->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.
|
| - context_menu_model_->AddCheckItemWithStringId(
|
| - LAUNCH_TYPE_FULLSCREEN,
|
| - IDS_APP_CONTEXT_MENU_OPEN_MAXIMIZED);
|
| -
|
| +#if defined(USE_ASH)
|
| + if (!ash::Shell::IsForcedMaximizeMode())
|
| +#endif
|
| + {
|
| + context_menu_model_->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.
|
| + context_menu_model_->AddCheckItemWithStringId(
|
| + LAUNCH_TYPE_FULLSCREEN,
|
| + IDS_APP_CONTEXT_MENU_OPEN_MAXIMIZED);
|
| + }
|
| context_menu_model_->AddSeparator(ui::NORMAL_SEPARATOR);
|
| context_menu_model_->AddItemWithStringId(OPTIONS,
|
| IDS_NEW_TAB_APP_OPTIONS);
|
|
|