Chromium Code Reviews| Index: chrome/browser/ui/browser_command_controller.cc |
| diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc |
| index bab1509dd9e8cf4e2cde7cabe829316a9ea90433..9c088e30620e93f9aa4a5e80f9ddb33ff8afd426 100644 |
| --- a/chrome/browser/ui/browser_command_controller.cc |
| +++ b/chrome/browser/ui/browser_command_controller.cc |
| @@ -1103,8 +1103,10 @@ Profile* BrowserCommandController::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(); |
|
Mr4D (OOO till 08-26)
2012/08/21 00:17:34
Please check that this does not crash with playing
Yusuke Sato
2012/08/21 00:28:23
Thanks for the review. I've confirmed that pressin
|
| #else |
| return false; |
| #endif |