| OLD | NEW |
|---|
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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 "ash/mus/top_level_window_factory.h" | 5 #include "ash/mus/top_level_window_factory.h" |
| 6 | 6 |
| 7 #include "ash/common/wm/container_finder.h" | |
| 8 #include "ash/common/wm/window_state.h" | |
| 9 #include "ash/common/wm_shell.h" | |
| 10 #include "ash/common/wm_window.h" | |
| 11 #include "ash/mus/disconnected_app_handler.h" | 7 #include "ash/mus/disconnected_app_handler.h" |
| 12 #include "ash/mus/frame/detached_title_area_renderer.h" | 8 #include "ash/mus/frame/detached_title_area_renderer.h" |
| 13 #include "ash/mus/non_client_frame_controller.h" | 9 #include "ash/mus/non_client_frame_controller.h" |
| 14 #include "ash/mus/property_util.h" | 10 #include "ash/mus/property_util.h" |
| 15 #include "ash/mus/window_manager.h" | 11 #include "ash/mus/window_manager.h" |
| 16 #include "ash/public/cpp/shell_window_ids.h" | 12 #include "ash/public/cpp/shell_window_ids.h" |
| 17 #include "ash/root_window_controller.h" | 13 #include "ash/root_window_controller.h" |
| 18 #include "ash/root_window_settings.h" | 14 #include "ash/root_window_settings.h" |
| 15 #include "ash/wm/container_finder.h" |
| 16 #include "ash/wm/window_state.h" |
| 17 #include "ash/wm_shell.h" |
| 18 #include "ash/wm_window.h" |
| 19 #include "mojo/public/cpp/bindings/type_converter.h" | 19 #include "mojo/public/cpp/bindings/type_converter.h" |
| 20 #include "services/ui/public/cpp/property_type_converters.h" | 20 #include "services/ui/public/cpp/property_type_converters.h" |
| 21 #include "services/ui/public/interfaces/window_manager.mojom.h" | 21 #include "services/ui/public/interfaces/window_manager.mojom.h" |
| 22 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" | 22 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" |
| 23 #include "ui/aura/client/aura_constants.h" | 23 #include "ui/aura/client/aura_constants.h" |
| 24 #include "ui/aura/mus/property_converter.h" | 24 #include "ui/aura/mus/property_converter.h" |
| 25 #include "ui/aura/mus/property_utils.h" | 25 #include "ui/aura/mus/property_utils.h" |
| 26 #include "ui/aura/mus/window_tree_client.h" | 26 #include "ui/aura/mus/window_tree_client.h" |
| 27 #include "ui/aura/window.h" | 27 #include "ui/aura/window.h" |
| 28 #include "ui/display/display.h" | 28 #include "ui/display/display.h" |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 if (non_client_frame_controller) | 228 if (non_client_frame_controller) |
| 229 non_client_frame_controller->set_can_activate(can_focus); | 229 non_client_frame_controller->set_can_activate(can_focus); |
| 230 // No need to persist this value. | 230 // No need to persist this value. |
| 231 properties->erase(focusable_iter); | 231 properties->erase(focusable_iter); |
| 232 } | 232 } |
| 233 return window; | 233 return window; |
| 234 } | 234 } |
| 235 | 235 |
| 236 } // namespace mus | 236 } // namespace mus |
| 237 } // namespace ash | 237 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2736573002:
chromeos: Move files in //ash/common to //ash, part 2 (Closed)
