Neuter alternate methods of entering fullscreen mode when in metro snap (via extension and via JS f…

chrome/browser/ui/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_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 112 matching lines @@
       NOTREACHED();
   }
   UpdateFullscreenExitBubbleContent();
 }
 
 void FullscreenController::ToggleFullscreenModeForTab(WebContents* web_contents,
                                                       bool enter_fullscreen) {
   if (web_contents != browser_->GetActiveWebContents())
     return;
 
+#if defined(OS_WIN)
+  // For now, avoid breaking when initiating full screen tab mode while in
+  // a metro snap.
+  // TODO(robertshield): Find a way to reconcile tab-initiated fullscreen
+  //                     modes with metro snap.
+  if (IsInMetroSnapMode())
+    return;
+#endif
+
   bool in_browser_or_tab_fullscreen_mode;
 #if defined(OS_MACOSX)
   in_browser_or_tab_fullscreen_mode = window_->InPresentationMode();
 #else
   in_browser_or_tab_fullscreen_mode = window_->IsFullscreen();
 #endif
 
   if (enter_fullscreen) {
     fullscreened_tab_ = TabContents::FromWebContents(web_contents);
     if (!in_browser_or_tab_fullscreen_mode) {
@@ skipping 28 matching lines @@
         // case, all we have to do is notifying the tab that it has exited "tab
         // fullscreen" mode.
         NotifyTabOfExitIfNecessary();
       }
     }
   }
 }
 
 #if defined(OS_WIN)
 void FullscreenController::SetMetroSnapMode(bool enable) {
+  toggled_into_fullscreen_ = false;
   window_->SetMetroSnapMode(enable);
 }
 #endif
 
 #if defined(OS_MACOSX)
 void FullscreenController::TogglePresentationMode() {
   TogglePresentationModeInternal(false);
 }
 #endif
 
@@ skipping 294 matching lines @@
     window_->ExitPresentationMode();
   UpdateFullscreenExitBubbleContent();
 
   // WindowFullscreenStateChanged will be called by BrowserWindowController
   // when the transition completes.
 }
 #endif
 
 // TODO(koz): Change |for_tab| to an enum.
 void FullscreenController::ToggleFullscreenModeInternal(bool for_tab) {
+#if defined(OS_WIN)
+  // When in Metro snap mode, toggling in and out of fullscreen is prevented.
+  if (IsInMetroSnapMode())
+    return;
+#endif
+
   toggled_into_fullscreen_ = !window_->IsFullscreen();
 
  // In kiosk mode, we always want to be fullscreen. When the browser first
  // starts we're not yet fullscreen, so let the initial toggle go through.
 #if !defined(OS_MACOSX)  // Kiosk mode not available on Mac.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode) &&
       window_->IsFullscreen())
     return;
 #endif
 
@@ skipping 13 matching lines @@
     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.
 }