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

Unified Diff: trunk/src/chrome/browser/ui/browser_command_controller.cc

Issue 252693007: Revert 266653 "[Mac] Allow fullscreen transitions while constrai..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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
« no previous file with comments | « no previous file | trunk/src/chrome/browser/ui/cocoa/browser_window_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/ui/browser_command_controller.cc
===================================================================
--- trunk/src/chrome/browser/ui/browser_command_controller.cc (revision 266682)
+++ trunk/src/chrome/browser/ui/browser_command_controller.cc (working copy)
@@ -1260,7 +1260,13 @@
// Disable explicit fullscreen toggling when in metro snap mode.
bool fullscreen_enabled = window_state != WINDOW_STATE_METRO_SNAP;
-#if !defined(OS_MACOSX)
+#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 (window_state == WINDOW_STATE_NOT_FULLSCREEN &&
!profile()->GetPrefs()->GetBoolean(prefs::kFullscreenAllowed)) {
// Disable toggling into fullscreen mode if disallowed by pref.
« no previous file with comments | « no previous file | trunk/src/chrome/browser/ui/cocoa/browser_window_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698