chrome/browser/ui/cocoa/browser_window_controller_private.mm - Issue 10700071: browser: Remove fullscreen functions and have callers call FullscreenController directly.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/browser_window_controller_private.mm

Issue 10700071: browser: Remove fullscreen functions and have callers call FullscreenController directly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 8 years, 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller.mm ('k') | chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/browser_window_controller_private.mm

diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm

index 744ed3b973a898aee8be4eefe0e990454002472e..669949574dab1f95ba69c7b21803b425dd121215 100644

--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm

+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm

@@ -31,6 +31,7 @@

#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"

#import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"

#import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"

+#include "chrome/browser/ui/fullscreen/fullscreen_controller.h"

#include "chrome/browser/ui/tab_contents/tab_contents.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

@@ -635,7 +636,8 @@ willPositionSheet:(NSWindow*)sheet

return;

if (presentationMode) {

- BOOL fullscreen_for_tab = browser_->IsFullscreenForTabOrPending();

+ BOOL fullscreen_for_tab =

+ browser_->fullscreen_controller()->IsFullscreenForTabOrPending();

BOOL kiosk_mode =

CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode);

BOOL showDropdown = !fullscreen_for_tab &&

@@ -821,7 +823,8 @@ willPositionSheet:(NSWindow*)sheet

NSWindow* window = [self window];

savedRegularWindowFrame_ = [window frame];

BOOL mode = [self shouldUsePresentationModeWhenEnteringFullscreen];

- mode = mode || browser_->IsFullscreenForTabOrPending();

+ mode = mode ||

+ browser_->fullscreen_controller()->IsFullscreenForTabOrPending();

enteringFullscreen_ = YES;

[self setPresentationModeInternal:mode forceDropdown:NO];

}