Merge 153206 - Re-enable Ctrl-w and Ctrl-Shift-w when a non-Pepper window is maximized.

chrome/browser/ui/browser_command_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser_command_controller.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 1085 matching lines @@
 BrowserWindow* BrowserCommandController::window() {
   return browser_->window();
 }
 
 Profile* BrowserCommandController::profile() {
   return browser_->profile();
 }
 
 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
 }
 
 }  // namespace chrome