[Mac] Make entering system fullscreen from presentation mode possible.

chrome/browser/ui/fullscreen/fullscreen_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
@@ skipping 487 matching lines @@
     tab_fullscreen_accepted_ = toggled_into_fullscreen_ &&
         GetFullscreenSetting(url) == CONTENT_SETTING_ALLOW;
   } else {
     if (!extension_caused_fullscreen_.is_empty())
       url = extension_caused_fullscreen_;
     content::RecordAction(UserMetricsAction("ToggleFullscreen"));
   }
   if (toggled_into_fullscreen_) {
     window_->EnterFullscreen(url, GetFullscreenExitBubbleType());
   } else {
-    window_->ExitFullscreen();
+#if defined(OS_MACOSX)

[scheib, 2012/08/03 02:45:58]

The #if MAC sections in this file make the logic confusing. Not necessarily with
this change, but in the current Mac full screen clean up effort, can we reduce
the platform #if defs in this file?

[Robert Sesek, 2012/08/03 14:44:08]

Yes, that's something I want to do. I think most of the logic in this file is
generally confusing, I just wanted to get the behavior right for M22.

+    if (window_->InPresentationMode())
+      window_->ExitPresentationMode();
+    else
+#endif
+      window_->ExitFullscreen();
     extension_caused_fullscreen_ = GURL();
   }
   UpdateFullscreenExitBubbleContent();
 
   // Once the window has become fullscreen it'll call back to
   // WindowFullscreenStateChanged(). We don't do this immediately as
   // BrowserWindow::EnterFullscreen() asks for bookmark_bar_state_, so we let
   // the BrowserWindow invoke WindowFullscreenStateChanged when appropriate.
 }
 
 #if defined(OS_MACOSX)
 void FullscreenController::TogglePresentationModeInternal(bool for_tab) {
   toggled_into_fullscreen_ = !window_->InPresentationMode();
   GURL url;
   if (for_tab) {
     url = chrome::GetActiveWebContents(browser_)->GetURL();
     tab_fullscreen_accepted_ = toggled_into_fullscreen_ &&
         GetFullscreenSetting(url) == CONTENT_SETTING_ALLOW;
   }
-  if (toggled_into_fullscreen_)
+  if (!window_->InPresentationMode())
     window_->EnterPresentationMode(url, GetFullscreenExitBubbleType());
   else
-    window_->ExitPresentationMode();
+    window_->ExitFullscreen();
   UpdateFullscreenExitBubbleContent();
 
   // WindowFullscreenStateChanged will be called by BrowserWindowController
   // when the transition completes.
 }
 #endif
 
 void FullscreenController::SetFullscreenedTab(TabContents* tab) {
   fullscreened_tab_ = tab;
   UpdateNotificationRegistrations();
@@ skipping 46 matching lines @@
 
 ContentSetting
     FullscreenController::GetMouseLockSetting(const GURL& url) const {
   if (url.SchemeIsFile())
     return CONTENT_SETTING_ALLOW;
 
   HostContentSettingsMap* settings_map = profile_->GetHostContentSettingsMap();
   return settings_map->GetContentSetting(url, url,
       CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string());
 }