chrome/browser/ui/browser_command_controller.cc - Issue 10879065: Merge 153206 - Re-enable Ctrl-w and Ctrl-Shift-w when a non-Pepper window is maximized.

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/browser_command_controller.cc

Issue 10879065: Merge 153206 - Re-enable Ctrl-w and Ctrl-Shift-w when a non-Pepper window is maximized. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1229/src/

Patch Set: Created 8 years, 4 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

Index: chrome/browser/ui/browser_command_controller.cc

===================================================================

--- chrome/browser/ui/browser_command_controller.cc (revision 153207)

+++ chrome/browser/ui/browser_command_controller.cc (working copy)

@@ -1103,8 +1103,10 @@

bool BrowserCommandController::IsFullScreenWindowOpen() {

#if defined(USE_ASH)

- aura::Window* window = ash::wm::GetActiveWindow();

- return (window && ash::wm::IsWindowFullscreen(window));

+ // Returns true when a Pepper Flash window is maximized.

+ aura::Window* aura_window = ash::wm::GetActiveWindow();

+ return aura_window && ash::wm::IsWindowFullscreen(aura_window) &&

+ !window()->IsFullscreen();

#else

return false;

#endif

« no previous file with comments | « no previous file | no next file » | no next file with comments »