| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "athena/screen/screen_manager_impl.h" | 5 #include "athena/screen/screen_manager_impl.h" |
| 6 | 6 |
| 7 #include "athena/input/public/accelerator_manager.h" | 7 #include "athena/input/public/accelerator_manager.h" |
| 8 #include "athena/screen/modal_window_controller.h" | 8 #include "athena/screen/modal_window_controller.h" |
| 9 #include "athena/screen/screen_accelerator_handler.h" | 9 #include "athena/screen/screen_accelerator_handler.h" |
| 10 #include "athena/util/container_priorities.h" | 10 #include "athena/util/container_priorities.h" |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 13 #include "ui/aura/client/aura_constants.h" | 13 #include "ui/aura/client/aura_constants.h" |
| 14 #include "ui/aura/client/screen_position_client.h" | 14 #include "ui/aura/client/screen_position_client.h" |
| 15 #include "ui/aura/test/test_screen.h" | 15 #include "ui/aura/test/test_screen.h" |
| 16 #include "ui/aura/window.h" | 16 #include "ui/aura/window.h" |
| 17 #include "ui/aura/window_property.h" | 17 #include "ui/aura/window_property.h" |
| 18 #include "ui/aura/window_targeter.h" | 18 #include "ui/aura/window_targeter.h" |
| 19 #include "ui/aura/window_tree_host.h" | 19 #include "ui/aura/window_tree_host.h" |
| 20 #include "ui/gfx/display.h" | 20 #include "ui/gfx/display.h" |
| 21 #include "ui/gfx/screen.h" | 21 #include "ui/gfx/screen.h" |
| 22 #include "ui/wm/core/base_focus_rules.h" | 22 #include "ui/wm/core/base_focus_rules.h" |
| 23 #include "ui/wm/core/capture_controller.h" | 23 #include "ui/wm/core/capture_controller.h" |
| 24 #include "ui/wm/core/default_screen_position_client.h" | 24 #include "ui/wm/core/default_screen_position_client.h" |
| 25 #include "ui/wm/core/focus_controller.h" | 25 #include "ui/wm/core/focus_controller.h" |
| 26 #include "ui/wm/core/window_util.h" | 26 #include "ui/wm/core/window_util.h" |
| 27 | 27 |
| 28 DECLARE_WINDOW_PROPERTY_TYPE(athena::ScreenManager::ContainerParams*); | 28 // This is to avoid creating type definitoin for kAlwaysOnTopKey. |
| 29 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ATHENA_EXPORT, bool); |
| 29 | 30 |
| 30 namespace athena { | 31 namespace athena { |
| 31 namespace { | 32 namespace { |
| 32 | 33 |
| 33 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ScreenManager::ContainerParams, | 34 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ScreenManager::ContainerParams, |
| 34 kContainerParamsKey, | 35 kContainerParamsKey, |
| 35 nullptr); | 36 nullptr); |
| 36 | 37 |
| 37 ScreenManagerImpl* instance = nullptr; | 38 ScreenManagerImpl* instance = nullptr; |
| 38 | 39 |
| (...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 411 } | 412 } |
| 412 | 413 |
| 413 // static | 414 // static |
| 414 void ScreenManager::Shutdown() { | 415 void ScreenManager::Shutdown() { |
| 415 DCHECK(instance); | 416 DCHECK(instance); |
| 416 delete instance; | 417 delete instance; |
| 417 DCHECK(!instance); | 418 DCHECK(!instance); |
| 418 } | 419 } |
| 419 | 420 |
| 420 } // namespace athena | 421 } // namespace athena |
| OLD | NEW |