OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/browser_command_controller.h" | 5 #include "chrome/browser/ui/browser_command_controller.h" |
6 | 6 |
7 #include "chrome/app/chrome_command_ids.h" | 7 #include "chrome/app/chrome_command_ids.h" |
8 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
9 #include "chrome/browser/defaults.h" | 9 #include "chrome/browser/defaults.h" |
10 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
(...skipping 1085 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1096 BrowserWindow* BrowserCommandController::window() { | 1096 BrowserWindow* BrowserCommandController::window() { |
1097 return browser_->window(); | 1097 return browser_->window(); |
1098 } | 1098 } |
1099 | 1099 |
1100 Profile* BrowserCommandController::profile() { | 1100 Profile* BrowserCommandController::profile() { |
1101 return browser_->profile(); | 1101 return browser_->profile(); |
1102 } | 1102 } |
1103 | 1103 |
1104 bool BrowserCommandController::IsFullScreenWindowOpen() { | 1104 bool BrowserCommandController::IsFullScreenWindowOpen() { |
1105 #if defined(USE_ASH) | 1105 #if defined(USE_ASH) |
1106 aura::Window* window = ash::wm::GetActiveWindow(); | 1106 // Returns true when a Pepper Flash window is maximized. |
1107 return (window && ash::wm::IsWindowFullscreen(window)); | 1107 aura::Window* aura_window = ash::wm::GetActiveWindow(); |
| 1108 return aura_window && ash::wm::IsWindowFullscreen(aura_window) && |
| 1109 !window()->IsFullscreen(); |
1108 #else | 1110 #else |
1109 return false; | 1111 return false; |
1110 #endif | 1112 #endif |
1111 } | 1113 } |
1112 | 1114 |
1113 } // namespace chrome | 1115 } // namespace chrome |
OLD | NEW |