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

Unified Diff: chrome/browser/ui/browser_command_controller.cc

Issue 10867053: Revert 153206 - Re-enable Ctrl-w and Ctrl-Shift-w when a non-Pepper window is maximized. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_command_controller.cc
===================================================================
--- chrome/browser/ui/browser_command_controller.cc (revision 153208)
+++ chrome/browser/ui/browser_command_controller.cc (working copy)
@@ -1100,10 +1100,8 @@
bool BrowserCommandController::IsFullScreenWindowOpen() {
#if defined(USE_ASH)
- // 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();
+ aura::Window* window = ash::wm::GetActiveWindow();
+ return (window && ash::wm::IsWindowFullscreen(window));
#else
return false;
#endif
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698