Automated tests for full screen & mouse lock M16 features

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 20 matching lines @@
     profile_(profile),
     browser_(browser),
     fullscreened_tab_(NULL),
     tab_caused_fullscreen_(false),
     tab_fullscreen_accepted_(false),
     mouse_lock_state_(MOUSELOCK_NOT_REQUESTED) {
 }
 
 FullscreenController::~FullscreenController() {}
 
-bool FullscreenController::IsFullscreenForTab() const {
+bool FullscreenController::IsFullscreenForBrowser() const {
+  return window_->IsFullscreen() && !tab_caused_fullscreen_;
+}
+
+bool FullscreenController::IsFullscreenForTabOrPending() const {
   return fullscreened_tab_ != NULL;
 }
 
-bool FullscreenController::IsFullscreenForTab(const WebContents* tab) const {
-  if (IsFullscreenForTabOrPending(tab)) {
-    DCHECK(window_->IsFullscreen());
-    return true;
-  }
-  return false;
-}
-
 bool FullscreenController::IsFullscreenForTabOrPending(
     const WebContents* tab) const {
   const TabContentsWrapper* wrapper =
       TabContentsWrapper::GetCurrentWrapperForContents(tab);
   if (!wrapper || (wrapper != fullscreened_tab_))
     return false;
   DCHECK(tab == browser_->GetSelectedWebContents());
   return true;
 }
 
+bool FullscreenController::IsMouseLockedOrPending() const {
+  return mouse_lock_state_ != MOUSELOCK_NOT_REQUESTED;
+}
+
 void FullscreenController::RequestToLockMouse(WebContents* tab) {
   // Mouse Lock is only permitted when browser is in tab fullscreen.
   if (!IsFullscreenForTabOrPending(tab)) {
     tab->GotResponseToLockMouseRequest(false);
     return;
   }
 
   if (mouse_lock_state_ == MOUSELOCK_ACCEPTED) {
     tab->GotResponseToLockMouseRequest(true);
     return;
@@ skipping 90 matching lines @@
   extension_caused_fullscreen_ = extension_url;
   ToggleFullscreenModeInternal(false);
 }
 
 void FullscreenController::LostMouseLock() {
   mouse_lock_state_ = MOUSELOCK_NOT_REQUESTED;
   UpdateFullscreenExitBubbleContent();
 }
 
 void FullscreenController::OnTabClosing(WebContents* web_contents) {
-  if (IsFullscreenForTab(web_contents)) {
+  if (IsFullscreenForTabOrPending(web_contents)) {
     ExitTabbedFullscreenModeIfNecessary();
     // The call to exit fullscreen may result in asynchronous notification of
     // fullscreen state change (e.g., on Linux). We don't want to rely on it
     // to call NotifyTabOfFullscreenExitIfNecessary(), because at that point
     // |fullscreen_tab_| may not be valid. Instead, we call it here to clean up
     // tab fullscreen related state.
     NotifyTabOfFullscreenExitIfNecessary();
   }
 }
 
@@ skipping 73 matching lines @@
     NotifyTabOfFullscreenExitIfNecessary();
 #if !defined(OS_CHROMEOS)
   if (exiting_fullscreen)
     window_->GetDownloadShelf()->Unhide();
   else
     window_->GetDownloadShelf()->Hide();
 #endif
 }
 
 bool FullscreenController::HandleUserPressedEscape() {
-  if (!IsFullscreenForTab())
+  if (!IsFullscreenForTabOrPending())
     return false;
   ExitTabbedFullscreenModeIfNecessary();
   return true;
 }
 
 void FullscreenController::NotifyTabOfFullscreenExitIfNecessary() {
   if (fullscreened_tab_ &&
       fullscreened_tab_->web_contents()->GetRenderViewHost()) {
     fullscreened_tab_->web_contents()->GetRenderViewHost()->ExitFullscreen();
   } else {
@@ skipping 123 matching lines @@
   // WindowFullscreenStateChanged(). We don't do this immediately as
   // BrowserWindow::EnterFullscreen() asks for bookmark_bar_state_, so we let
   // the BrowserWindow invoke WindowFullscreenStateChanged when appropriate.
 
   // TODO: convert mac to invoke WindowFullscreenStateChanged once it updates
   // the necessary state of the frame.
 #if defined(OS_MACOSX)
   WindowFullscreenStateChanged();
 #endif
 }