Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1062)

Unified Diff: chrome/browser/extensions/extension_prefs.cc

Issue 13934007: Adding experimental maximize mode (behind a flag) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed flag usage again Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_prefs.cc
diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc
index e1aada0e092c8a49a484cc5421551914e0080004..02ed59d394e4c8fc18d41c1dedc684f0641cf859 100644
--- a/chrome/browser/extensions/extension_prefs.cc
+++ b/chrome/browser/extensions/extension_prefs.cc
@@ -32,6 +32,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
@@ -1261,13 +1264,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.

Powered by Google App Engine
This is Rietveld 408576698