OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "ash/common/wm_window.h" | 5 #include "ash/common/wm_window.h" |
6 | 6 |
7 #include "ash/aura/aura_layout_manager_adapter.h" | 7 #include "ash/aura/aura_layout_manager_adapter.h" |
8 #include "ash/aura/wm_shell_aura.h" | 8 #include "ash/aura/wm_shell_aura.h" |
9 #include "ash/common/ash_constants.h" | 9 #include "ash/common/ash_constants.h" |
10 #include "ash/common/shelf/shelf_item_types.h" | 10 #include "ash/common/shelf/shelf_item_types.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 #include "ui/aura/client/aura_constants.h" | 29 #include "ui/aura/client/aura_constants.h" |
30 #include "ui/aura/client/focus_client.h" | 30 #include "ui/aura/client/focus_client.h" |
31 #include "ui/aura/client/window_parenting_client.h" | 31 #include "ui/aura/client/window_parenting_client.h" |
32 #include "ui/aura/env.h" | 32 #include "ui/aura/env.h" |
33 #include "ui/aura/layout_manager.h" | 33 #include "ui/aura/layout_manager.h" |
34 #include "ui/aura/mus/window_manager_delegate.h" | 34 #include "ui/aura/mus/window_manager_delegate.h" |
35 #include "ui/aura/mus/window_mus.h" | 35 #include "ui/aura/mus/window_mus.h" |
36 #include "ui/aura/mus/window_tree_client.h" | 36 #include "ui/aura/mus/window_tree_client.h" |
37 #include "ui/aura/window.h" | 37 #include "ui/aura/window.h" |
38 #include "ui/aura/window_delegate.h" | 38 #include "ui/aura/window_delegate.h" |
39 #include "ui/aura/window_property.h" | 39 #include "ui/base/class_property.h" |
40 #include "ui/base/hit_test.h" | 40 #include "ui/base/hit_test.h" |
41 #include "ui/compositor/layer_tree_owner.h" | 41 #include "ui/compositor/layer_tree_owner.h" |
42 #include "ui/compositor/scoped_layer_animation_settings.h" | 42 #include "ui/compositor/scoped_layer_animation_settings.h" |
43 #include "ui/display/screen.h" | 43 #include "ui/display/screen.h" |
44 #include "ui/gfx/geometry/insets.h" | 44 #include "ui/gfx/geometry/insets.h" |
45 #include "ui/views/widget/widget.h" | 45 #include "ui/views/widget/widget.h" |
46 #include "ui/views/widget/widget_delegate.h" | 46 #include "ui/views/widget/widget_delegate.h" |
47 #include "ui/wm/core/coordinate_conversion.h" | 47 #include "ui/wm/core/coordinate_conversion.h" |
48 #include "ui/wm/core/easy_resize_window_targeter.h" | 48 #include "ui/wm/core/easy_resize_window_targeter.h" |
49 #include "ui/wm/core/transient_window_manager.h" | 49 #include "ui/wm/core/transient_window_manager.h" |
50 #include "ui/wm/core/visibility_controller.h" | 50 #include "ui/wm/core/visibility_controller.h" |
51 #include "ui/wm/core/window_util.h" | 51 #include "ui/wm/core/window_util.h" |
52 | 52 |
53 DECLARE_WINDOW_PROPERTY_TYPE(ash::WmWindow*); | 53 DECLARE_UI_CLASS_PROPERTY_TYPE(ash::WmWindow*); |
54 | 54 |
55 namespace ash { | 55 namespace ash { |
56 | 56 |
57 DEFINE_OWNED_WINDOW_PROPERTY_KEY(WmWindow, kWmWindowKey, nullptr); | 57 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(WmWindow, kWmWindowKey, nullptr); |
58 | 58 |
59 static_assert(aura::Window::kInitialId == kShellWindowId_Invalid, | 59 static_assert(aura::Window::kInitialId == kShellWindowId_Invalid, |
60 "ids must match"); | 60 "ids must match"); |
61 | 61 |
62 namespace { | 62 namespace { |
63 | 63 |
64 // A tentative class to set the bounds on the window. | 64 // A tentative class to set the bounds on the window. |
65 // TODO(oshima): Once all logic is cleaned up, move this to the real layout | 65 // TODO(oshima): Once all logic is cleaned up, move this to the real layout |
66 // manager with proper friendship. | 66 // manager with proper friendship. |
67 class BoundsSetter : public aura::LayoutManager { | 67 class BoundsSetter : public aura::LayoutManager { |
(...skipping 941 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1009 observer.OnTransientChildAdded(this, Get(transient)); | 1009 observer.OnTransientChildAdded(this, Get(transient)); |
1010 } | 1010 } |
1011 | 1011 |
1012 void WmWindow::OnTransientChildRemoved(aura::Window* window, | 1012 void WmWindow::OnTransientChildRemoved(aura::Window* window, |
1013 aura::Window* transient) { | 1013 aura::Window* transient) { |
1014 for (auto& observer : transient_observers_) | 1014 for (auto& observer : transient_observers_) |
1015 observer.OnTransientChildRemoved(this, Get(transient)); | 1015 observer.OnTransientChildRemoved(this, Get(transient)); |
1016 } | 1016 } |
1017 | 1017 |
1018 } // namespace ash | 1018 } // namespace ash |
OLD | NEW |