Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2016 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/fullscreen.h" | 5 #include "chrome/browser/fullscreen.h" |
| 6 | 6 |
| 7 #include "ash/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
| 8 #include "chrome/browser/ui/ash/ash_util.h" | 8 #include "chrome/browser/ui/ash/ash_util.h" |
| 9 | 9 |
| 10 bool IsFullScreenMode() { | 10 bool IsFullScreenMode() { |
| 11 if (chrome::IsRunningInMash()) { | 11 #if defined(USE_ASH) |
|
sky
2016/10/26 17:37:15
I'm confused by what conditions this code would be
fwang
2016/10/31 11:38:49
Yes, USE_ASH is very confusing as ash can be built
| |
| 12 if (chrome::IsRunningInMash()) | |
| 13 #endif | |
| 14 { | |
| 12 // TODO: http://crbug.com/640390. | 15 // TODO: http://crbug.com/640390. |
| 13 NOTIMPLEMENTED(); | 16 NOTIMPLEMENTED(); |
| 14 return false; | 17 return false; |
| 15 } | 18 } |
| 19 | |
| 16 // TODO(oshima): Fullscreen is per display state. Investigate | 20 // TODO(oshima): Fullscreen is per display state. Investigate |
| 17 // and fix if necessary. | 21 // and fix if necessary. |
| 18 ash::RootWindowController* controller = | 22 ash::RootWindowController* controller = |
| 19 ash::RootWindowController::ForTargetRootWindow(); | 23 ash::RootWindowController::ForTargetRootWindow(); |
| 20 return controller && controller->GetWindowForFullscreenMode(); | 24 return controller && controller->GetWindowForFullscreenMode(); |
| 21 } | 25 } |
| OLD | NEW |