diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-28 20:52:58 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-28 20:52:58 +0000 |
| commit | 63af87bc70dc86bad887d296099c2983cb5b28e7 (patch) | |
| tree | b9a932755c37736204492a75205cbe7036c25842 /chrome/browser/ui/browser_command_controller.cc | |
| parent | 36a0066c69c6db309d2b20f3b2dedb0403393a6d (diff) | |
| download | chromium_src-63af87bc70dc86bad887d296099c2983cb5b28e7.zip chromium_src-63af87bc70dc86bad887d296099c2983cb5b28e7.tar.gz chromium_src-63af87bc70dc86bad887d296099c2983cb5b28e7.tar.bz2 | |
[Mac] Allow fullscreen transitions while constrained windows are open.
r166410 disabled the browser from entering fullscreen mode when any one
tab has a constrained window open (e.g., Print dialog). However, this
is inconsistent with the behavior on all other desktop platforms. This
change removes the restriction.
Landing on behalf of miu@chromium.org manually, as to make a branch cut.
BUG=366567,146451
TEST=Repro steps in bug 366567 (easier to understand from the multiple demo videos). Also, manual testing of browser transition into and out of fullscreen before/after a print dialog is open.
R=avi@chromium.org, sky@chromium.org
Review URL: https://codereview.chromium.org/253493005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266653 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_command_controller.cc')
| -rw-r--r-- | chrome/browser/ui/browser_command_controller.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc index 9982ef7..fc95256 100644 --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc @@ -1260,13 +1260,7 @@ void BrowserCommandController::UpdateCommandsForFullscreenMode() { // Disable explicit fullscreen toggling when in metro snap mode. bool fullscreen_enabled = window_state != WINDOW_STATE_METRO_SNAP; -#if defined(OS_MACOSX) - // The Mac implementation doesn't support switching to fullscreen while - // a tab modal dialog is displayed. - int tab_index = chrome::IndexOfFirstBlockedTab(browser_->tab_strip_model()); - bool has_blocked_tab = tab_index != browser_->tab_strip_model()->count(); - fullscreen_enabled &= !has_blocked_tab; -#else +#if !defined(OS_MACOSX) if (window_state == WINDOW_STATE_NOT_FULLSCREEN && !profile()->GetPrefs()->GetBoolean(prefs::kFullscreenAllowed)) { // Disable toggling into fullscreen mode if disallowed by pref. |