diff options
| author | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-16 22:21:10 +0000 |
|---|---|---|
| committer | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-16 22:21:10 +0000 |
| commit | 326464d10c41fd36305c34a295d3844eba508810 (patch) | |
| tree | 0515b64edd25290a3a3ed41abb93b29a35410763 /chrome | |
| parent | 500f176dbbd17fee9f903d0163dafa89593cc1c0 (diff) | |
| download | chromium_src-326464d10c41fd36305c34a295d3844eba508810.zip chromium_src-326464d10c41fd36305c34a295d3844eba508810.tar.gz chromium_src-326464d10c41fd36305c34a295d3844eba508810.tar.bz2 | |
[Mac] Enable fullscreen
BUG=31638
TEST=Should be able to toggle fullscreen mode.
Review URL: http://codereview.chromium.org/567029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/browser.cc | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 4810c3c0..8bfb10c6 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -733,7 +733,11 @@ void Browser::ShowSingletonTab(const GURL& url) { } void Browser::UpdateCommandsForFullscreenMode(bool is_fullscreen) { +#if !defined(OS_MACOSX) const bool show_main_ui = (type() == TYPE_NORMAL) && !is_fullscreen; +#else + const bool show_main_ui = (type() == TYPE_NORMAL); +#endif // Navigation commands command_updater_.UpdateCommandEnabled(IDC_OPEN_CURRENT_URL, show_main_ui); @@ -1076,7 +1080,14 @@ bool Browser::SupportsWindowFeature(WindowFeature feature) const { features |= FEATURE_BOOKMARKBAR; features |= FEATURE_EXTENSIONSHELF; } - if (!window_ || !window_->IsFullscreen()) { + + // On Mac, fullscreen mode has most normal things (in a slide-down panel). On + // other platforms, we hide some controls when in fullscreen mode. + bool hide_ui_for_fullscreen = false; +#if !defined(OS_MACOSX) + hide_ui_for_fullscreen = window_ && window_->IsFullscreen(); +#endif + if (!hide_ui_for_fullscreen) { if (type() == TYPE_NORMAL) features |= FEATURE_TABSTRIP | FEATURE_TOOLBAR; else @@ -2517,11 +2528,7 @@ void Browser::InitCommandState() { command_updater_.UpdateCommandEnabled(IDC_NEW_TAB, true); command_updater_.UpdateCommandEnabled(IDC_CLOSE_TAB, true); command_updater_.UpdateCommandEnabled(IDC_DUPLICATE_TAB, true); -// TODO(viettrungluu): Temporarily disabled on Mac. Must disable here (not in -// BWC) so that it also affects the wrench menu. http://crbug.com/31638 -#if !defined(OS_MACOSX) command_updater_.UpdateCommandEnabled(IDC_FULLSCREEN, true); -#endif command_updater_.UpdateCommandEnabled(IDC_EXIT, true); // Page-related commands |