diff options
| author | erikchen@chromium.org <erikchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 09:06:29 +0000 |
|---|---|---|
| committer | erikchen@chromium.org <erikchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 09:06:29 +0000 |
| commit | 906b56feb8f7e8a38f76c222a96134b3c677ecd4 (patch) | |
| tree | 4c9a94204a9bd79be4e10385771d7df6cc444852 | |
| parent | eb061c43895c8950b2905321384dfd00e16c8454 (diff) | |
| download | chromium_src-906b56feb8f7e8a38f76c222a96134b3c677ecd4.zip chromium_src-906b56feb8f7e8a38f76c222a96134b3c677ecd4.tar.gz chromium_src-906b56feb8f7e8a38f76c222a96134b3c677ecd4.tar.bz2 | |
mac: [Yosemite] Add a flag to use a full size content view.
The flag is --enable-full-size-content-view. The default behavior is to not use
the full-size content view, since the warning it was designed to prevent is no
longer triggered on Yosemite DP4.
BUG=398574
Review URL: https://codereview.chromium.org/415363003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286728 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/cocoa/version_independent_window.mm | 8 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 4 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/chrome/browser/ui/cocoa/version_independent_window.mm b/chrome/browser/ui/cocoa/version_independent_window.mm index 24284a4..06a139e 100644 --- a/chrome/browser/ui/cocoa/version_independent_window.mm +++ b/chrome/browser/ui/cocoa/version_independent_window.mm @@ -4,8 +4,10 @@ #import "chrome/browser/ui/cocoa/version_independent_window.h" +#include "base/command_line.h" #include "base/logging.h" #include "base/mac/mac_util.h" +#include "chrome/common/chrome_switches.h" @interface VersionIndependentWindow () @@ -89,6 +91,12 @@ #pragma mark - Private Methods + (BOOL)shouldUseFullSizeContentViewForStyle:(NSUInteger)windowStyle { + // TODO(erikchen): Once OSX Yosemite is released, consider removing this + // class entirely. + // http://crbug.com/398574 + if (!CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableFullSizeContentView)) + return NO; return (windowStyle & NSTitledWindowMask) && base::mac::IsOSYosemiteOrLater(); } diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 4d07811..08c401b 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -1304,6 +1304,10 @@ const char kAppsKeepChromeAliveInTests[] = "apps-keep-chrome-alive-in-tests"; const char kDisableSystemFullscreenForTesting[] = "disable-system-fullscreen-for-testing"; +// Makes the browser window's contentView take up the full size of the +// window in OSX Yosemite. +const char kEnableFullSizeContentView[] = "enable-full-size-content-view"; + // Enables a simplified fullscreen UI on Mac. const char kEnableSimplifiedFullscreen[] = "enable-simplified-fullscreen"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 42ee491..5eb6e17 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -382,6 +382,7 @@ extern const char kMigrateDataDirForSxS[]; #if defined(OS_MACOSX) extern const char kAppsKeepChromeAliveInTests[]; extern const char kDisableSystemFullscreenForTesting[]; +extern const char kEnableFullSizeContentView[]; extern const char kEnableSimplifiedFullscreen[]; extern const char kRelauncherProcess[]; #endif |