| OLD | NEW |
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/window_manager.h" | 5 #include "ash/mus/window_manager.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| 11 #include "ash/common/session/session_controller.h" | 11 #include "ash/common/session/session_controller.h" |
| 12 #include "ash/common/system/tray/system_tray_delegate.h" | 12 #include "ash/common/system/tray/system_tray_delegate.h" |
| 13 #include "ash/common/wm/container_finder.h" | 13 #include "ash/common/wm/container_finder.h" |
| 14 #include "ash/common/wm/window_state.h" | 14 #include "ash/common/wm/window_state.h" |
| 15 #include "ash/common/wm_window.h" | 15 #include "ash/common/wm_window.h" |
| 16 #include "ash/mus/accelerators/accelerator_handler.h" | 16 #include "ash/mus/accelerators/accelerator_handler.h" |
| 17 #include "ash/mus/accelerators/accelerator_ids.h" | 17 #include "ash/mus/accelerators/accelerator_ids.h" |
| 18 #include "ash/mus/bridge/wm_lookup_mus.h" | 18 #include "ash/mus/bridge/wm_lookup_mus.h" |
| 19 #include "ash/mus/bridge/wm_shell_mus.h" | 19 #include "ash/mus/bridge/wm_shell_mus.h" |
| 20 #include "ash/mus/move_event_handler.h" | 20 #include "ash/mus/move_event_handler.h" |
| 21 #include "ash/mus/non_client_frame_controller.h" | 21 #include "ash/mus/non_client_frame_controller.h" |
| 22 #include "ash/mus/property_util.h" | 22 #include "ash/mus/property_util.h" |
| 23 #include "ash/mus/screen_mus.h" | 23 #include "ash/mus/screen_mus.h" |
| 24 #include "ash/mus/shadow_controller.h" | 24 #include "ash/mus/shadow_controller.h" |
| 25 #include "ash/mus/shell_delegate_mus.h" | 25 #include "ash/mus/shell_delegate_mus.h" |
| 26 #include "ash/mus/top_level_window_factory.h" | 26 #include "ash/mus/top_level_window_factory.h" |
| 27 #include "ash/mus/window_properties.h" | 27 #include "ash/mus/window_properties.h" |
| 28 #include "ash/public/cpp/shell_window_ids.h" | 28 #include "ash/public/cpp/shell_window_ids.h" |
| 29 #include "ash/public/cpp/window_properties.h" |
| 29 #include "ash/root_window_controller.h" | 30 #include "ash/root_window_controller.h" |
| 30 #include "ash/root_window_settings.h" | 31 #include "ash/root_window_settings.h" |
| 31 #include "ash/shell.h" | 32 #include "ash/shell.h" |
| 32 #include "ash/shell_init_params.h" | 33 #include "ash/shell_init_params.h" |
| 33 #include "ash/wm/ash_focus_rules.h" | 34 #include "ash/wm/ash_focus_rules.h" |
| 34 #include "ash/wm/window_properties.h" | |
| 35 #include "base/memory/ptr_util.h" | 35 #include "base/memory/ptr_util.h" |
| 36 #include "services/service_manager/public/cpp/connector.h" | 36 #include "services/service_manager/public/cpp/connector.h" |
| 37 #include "services/ui/common/accelerator_util.h" | 37 #include "services/ui/common/accelerator_util.h" |
| 38 #include "services/ui/common/types.h" | 38 #include "services/ui/common/types.h" |
| 39 #include "services/ui/public/cpp/property_type_converters.h" | 39 #include "services/ui/public/cpp/property_type_converters.h" |
| 40 #include "services/ui/public/interfaces/constants.mojom.h" | 40 #include "services/ui/public/interfaces/constants.mojom.h" |
| 41 #include "services/ui/public/interfaces/window_manager.mojom.h" | 41 #include "services/ui/public/interfaces/window_manager.mojom.h" |
| 42 #include "ui/aura/client/window_parenting_client.h" | 42 #include "ui/aura/client/window_parenting_client.h" |
| 43 #include "ui/aura/env.h" | 43 #include "ui/aura/env.h" |
| 44 #include "ui/aura/mus/property_converter.h" | 44 #include "ui/aura/mus/property_converter.h" |
| (...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 455 bool WindowManager::IsWindowActive(aura::Window* window) { | 455 bool WindowManager::IsWindowActive(aura::Window* window) { |
| 456 return Shell::GetInstance()->activation_client()->GetActiveWindow() == window; | 456 return Shell::GetInstance()->activation_client()->GetActiveWindow() == window; |
| 457 } | 457 } |
| 458 | 458 |
| 459 void WindowManager::OnWmDeactivateWindow(aura::Window* window) { | 459 void WindowManager::OnWmDeactivateWindow(aura::Window* window) { |
| 460 Shell::GetInstance()->activation_client()->DeactivateWindow(window); | 460 Shell::GetInstance()->activation_client()->DeactivateWindow(window); |
| 461 } | 461 } |
| 462 | 462 |
| 463 } // namespace mus | 463 } // namespace mus |
| 464 } // namespace ash | 464 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2664113004:
Reland: mash: Fix MusPropertyMirrorAsh for owned properties; add test. (Closed)
