| Index: chrome/browser/extensions/extension_prefs.cc
|
| diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc
|
| index 9cb27c3e783daf388579db97d681670beb22511a..9308daee628b083532ffce2b9375b2444224b5e2 100644
|
| --- a/chrome/browser/extensions/extension_prefs.cc
|
| +++ b/chrome/browser/extensions/extension_prefs.cc
|
| @@ -34,6 +34,9 @@
|
| #include "grit/generated_resources.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
|
|
| +#if defined(USE_ASH)
|
| +#include "ash/shell.h"
|
| +#endif
|
| #if defined(OS_WIN)
|
| #include "win8/util/win8_util.h"
|
| #endif // OS_WIN
|
| @@ -1194,13 +1197,18 @@ ExtensionPrefs::LaunchType ExtensionPrefs::GetLaunchType(
|
| } else {
|
| result = default_pref_value;
|
| }
|
| - #if defined(OS_MACOSX)
|
| +#if (USE_ASH)
|
| + if (ash::Shell::IsForcedMaximizeMode() &&
|
| + (result == LAUNCH_FULLSCREEN || result == LAUNCH_WINDOW))
|
| + result = LAUNCH_REGULAR;
|
| +#endif
|
| +#if defined(OS_MACOSX)
|
| // App windows are not yet supported on mac. Pref sync could make
|
| // the launch type LAUNCH_WINDOW, even if there is no UI to set it
|
| // on mac.
|
| if (!extension->is_platform_app() && result == LAUNCH_WINDOW)
|
| result = LAUNCH_REGULAR;
|
| - #endif
|
| +#endif
|
|
|
| #if defined(OS_WIN)
|
| // We don't support app windows in Windows 8 single window Metro mode.
|
|
|