Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Side by Side Diff: chrome/browser/ui/fullscreen/fullscreen_controller.cc

Issue 523233002: mac: Remove simplified fullscreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@new_fullscreen2
Patch Set: Rebase against top of tree. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/cocoa/presentation_mode_controller.h ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/fullscreen_controller.h" 5 #include "chrome/browser/ui/fullscreen/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/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "chrome/browser/app_mode/app_mode_utils.h" 10 #include "chrome/browser/app_mode/app_mode_utils.h"
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 201
202 // FullscreenController unit tests for metro snap assume that on Windows calls 202 // FullscreenController unit tests for metro snap assume that on Windows calls
203 // to WindowFullscreenStateChanged are reentrant. If that assumption is 203 // to WindowFullscreenStateChanged are reentrant. If that assumption is
204 // invalidated, the tests must be updated to maintain coverage. 204 // invalidated, the tests must be updated to maintain coverage.
205 CHECK(reentrant_window_state_change_call_check_); 205 CHECK(reentrant_window_state_change_call_check_);
206 } 206 }
207 #endif // defined(OS_WIN) 207 #endif // defined(OS_WIN)
208 208
209 #if defined(OS_MACOSX) 209 #if defined(OS_MACOSX)
210 void FullscreenController::ToggleBrowserFullscreenWithChrome() { 210 void FullscreenController::ToggleBrowserFullscreenWithChrome() {
211 // This method cannot be called if simplified fullscreen is enabled.
212 const CommandLine* command_line = CommandLine::ForCurrentProcess();
213 DCHECK(!command_line->HasSwitch(switches::kEnableSimplifiedFullscreen));
214 ToggleFullscreenModeInternal(BROWSER_WITH_CHROME); 211 ToggleFullscreenModeInternal(BROWSER_WITH_CHROME);
215 } 212 }
216 #endif 213 #endif
217 214
218 bool FullscreenController::IsMouseLockRequested() const { 215 bool FullscreenController::IsMouseLockRequested() const {
219 return mouse_lock_state_ == MOUSELOCK_REQUESTED; 216 return mouse_lock_state_ == MOUSELOCK_REQUESTED;
220 } 217 }
221 218
222 bool FullscreenController::IsMouseLocked() const { 219 bool FullscreenController::IsMouseLocked() const {
223 return mouse_lock_state_ == MOUSELOCK_ACCEPTED || 220 return mouse_lock_state_ == MOUSELOCK_ACCEPTED ||
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
758 (fullscreened_tab_ == mouse_lock_tab_ && IsPrivilegedFullscreenForTab()) ? 755 (fullscreened_tab_ == mouse_lock_tab_ && IsPrivilegedFullscreenForTab()) ?
759 mouse_lock_tab_->GetFullscreenRenderWidgetHostView() : NULL; 756 mouse_lock_tab_->GetFullscreenRenderWidgetHostView() : NULL;
760 if (!mouse_lock_view) { 757 if (!mouse_lock_view) {
761 RenderViewHost* const rvh = mouse_lock_tab_->GetRenderViewHost(); 758 RenderViewHost* const rvh = mouse_lock_tab_->GetRenderViewHost();
762 if (rvh) 759 if (rvh)
763 mouse_lock_view = rvh->GetView(); 760 mouse_lock_view = rvh->GetView();
764 } 761 }
765 if (mouse_lock_view) 762 if (mouse_lock_view)
766 mouse_lock_view->UnlockMouse(); 763 mouse_lock_view->UnlockMouse();
767 } 764 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/presentation_mode_controller.h ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698