#endif
bool in_browser_or_tab_fullscreen_mode = window_->IsFullscreen();
- bool window_is_fullscreen_with_chrome = false;
-#if defined(OS_MACOSX)
- window_is_fullscreen_with_chrome = window_->IsFullscreenWithChrome();
-#endif
if (enter_fullscreen) {
SetFullscreenedTab(web_contents);
if (!in_browser_or_tab_fullscreen_mode) {
state_prior_to_tab_fullscreen_ = STATE_NORMAL;
ToggleFullscreenModeInternal(TAB);
- } else if (window_is_fullscreen_with_chrome) {
+ } else {
#if defined(OS_MACOSX)
- state_prior_to_tab_fullscreen_ = STATE_BROWSER_FULLSCREEN_WITH_CHROME;
- EnterFullscreenModeInternal(TAB);
+ state_prior_to_tab_fullscreen_ =
+ window_->IsFullscreenWithChrome()
+ ? STATE_BROWSER_FULLSCREEN_WITH_CHROME
+ : STATE_BROWSER_FULLSCREEN_NO_CHROME;
+
+ // The browser is in AppKit fullscreen. Remove the chrome, if it's
+ // present.
+ window_->EnterFullscreenWithoutChrome();
#else
- NOTREACHED();
-#endif
- } else {
state_prior_to_tab_fullscreen_ = STATE_BROWSER_FULLSCREEN_NO_CHROME;
+#endif // defined(OS_MACOSX)
// We need to update the fullscreen exit bubble, e.g., going from browser
// fullscreen to tab fullscreen will need to show different content.
#if defined(OS_MACOSX)
if (state_prior_to_tab_fullscreen_ ==
STATE_BROWSER_FULLSCREEN_WITH_CHROME) {
- EnterFullscreenModeInternal(BROWSER_WITH_CHROME);
- } else {
- // Clear the bubble URL, which forces the Mac UI to redraw.
- UpdateFullscreenExitBubbleContent();
+ // The browser is still in AppKit Fullscreen. This just adds back the
+ // chrome.
+ window_->EnterFullscreenWithChrome();
}
-#endif
+
+ // Clear the bubble URL, which forces the Mac UI to redraw.
+ UpdateFullscreenExitBubbleContent();
+#endif // defined(OS_MACOSX)
+
// If currently there is a tab in "tab fullscreen" mode and fullscreen
// was not caused by it (i.e., previously it was in "browser fullscreen"
// mode), we need to switch back to "browser fullscreen" mode. In this