| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/fullscreen_controller.h" | 5 #include "chrome/browser/ui/fullscreen_controller.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "chrome/browser/content_settings/host_content_settings_map.h" | 10 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 TogglePresentationModeInternal(false); | 150 TogglePresentationModeInternal(false); |
| 151 } | 151 } |
| 152 #endif | 152 #endif |
| 153 | 153 |
| 154 void FullscreenController::ToggleFullscreenMode() { | 154 void FullscreenController::ToggleFullscreenMode() { |
| 155 extension_caused_fullscreen_ = GURL(); | 155 extension_caused_fullscreen_ = GURL(); |
| 156 ToggleFullscreenModeInternal(false); | 156 ToggleFullscreenModeInternal(false); |
| 157 } | 157 } |
| 158 | 158 |
| 159 void FullscreenController::ToggleFullscreenModeWithExtension( | 159 void FullscreenController::ToggleFullscreenModeWithExtension( |
| 160 const Extension& extension) { | 160 const GURL& extension_url) { |
| 161 // |extension_caused_fullscreen_| will be reset if this causes fullscreen to | 161 // |extension_caused_fullscreen_| will be reset if this causes fullscreen to |
| 162 // exit. | 162 // exit. |
| 163 extension_caused_fullscreen_ = extension.url(); | 163 extension_caused_fullscreen_ = extension_url; |
| 164 ToggleFullscreenModeInternal(false); | 164 ToggleFullscreenModeInternal(false); |
| 165 } | 165 } |
| 166 | 166 |
| 167 void FullscreenController::LostMouseLock() { | 167 void FullscreenController::LostMouseLock() { |
| 168 mouse_lock_state_ = MOUSELOCK_NOT_REQUESTED; | 168 mouse_lock_state_ = MOUSELOCK_NOT_REQUESTED; |
| 169 UpdateFullscreenExitBubbleContent(); | 169 UpdateFullscreenExitBubbleContent(); |
| 170 } | 170 } |
| 171 | 171 |
| 172 void FullscreenController::OnTabClosing(WebContents* web_contents) { | 172 void FullscreenController::OnTabClosing(WebContents* web_contents) { |
| 173 if (IsFullscreenForTab(web_contents)) { | 173 if (IsFullscreenForTab(web_contents)) { |
| (...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 401 // WindowFullscreenStateChanged(). We don't do this immediately as | 401 // WindowFullscreenStateChanged(). We don't do this immediately as |
| 402 // BrowserWindow::EnterFullscreen() asks for bookmark_bar_state_, so we let | 402 // BrowserWindow::EnterFullscreen() asks for bookmark_bar_state_, so we let |
| 403 // the BrowserWindow invoke WindowFullscreenStateChanged when appropriate. | 403 // the BrowserWindow invoke WindowFullscreenStateChanged when appropriate. |
| 404 | 404 |
| 405 // TODO: convert mac to invoke WindowFullscreenStateChanged once it updates | 405 // TODO: convert mac to invoke WindowFullscreenStateChanged once it updates |
| 406 // the necessary state of the frame. | 406 // the necessary state of the frame. |
| 407 #if defined(OS_MACOSX) | 407 #if defined(OS_MACOSX) |
| 408 WindowFullscreenStateChanged(); | 408 WindowFullscreenStateChanged(); |
| 409 #endif | 409 #endif |
| 410 } | 410 } |
| OLD | NEW |