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/aura/aura_layout_manager_adapter.h" | 5 #include "ash/aura/aura_layout_manager_adapter.h" |
6 | 6 |
7 #include "ash/common/wm_layout_manager.h" | 7 #include "ash/common/wm_layout_manager.h" |
8 #include "ash/common/wm_window.h" | 8 #include "ash/common/wm_window.h" |
9 #include "ui/aura/window_property.h" | 9 #include "ui/aura/window.h" |
| 10 #include "ui/base/class_property.h" |
10 | 11 |
11 DECLARE_WINDOW_PROPERTY_TYPE(ash::AuraLayoutManagerAdapter*); | 12 DECLARE_UI_CLASS_PROPERTY_TYPE(ash::AuraLayoutManagerAdapter*); |
12 | 13 |
13 namespace ash { | 14 namespace ash { |
14 namespace { | 15 namespace { |
15 // AuraLayoutManagerAdapter is an aura::LayoutManager, so it's owned by the | 16 // AuraLayoutManagerAdapter is an aura::LayoutManager, so it's owned by the |
16 // aura::Window it is installed on. This property is used to lookup the | 17 // aura::Window it is installed on. This property is used to lookup the |
17 // AuraLayoutManagerAdapter given only an aura::Window. | 18 // AuraLayoutManagerAdapter given only an aura::Window. |
18 DEFINE_WINDOW_PROPERTY_KEY(AuraLayoutManagerAdapter*, | 19 DEFINE_UI_CLASS_PROPERTY_KEY(AuraLayoutManagerAdapter*, |
19 kAuraLayoutManagerAdapter, | 20 kAuraLayoutManagerAdapter, |
20 nullptr); | 21 nullptr); |
21 } // namespace | 22 } // namespace |
22 | 23 |
23 AuraLayoutManagerAdapter::AuraLayoutManagerAdapter( | 24 AuraLayoutManagerAdapter::AuraLayoutManagerAdapter( |
24 aura::Window* window, | 25 aura::Window* window, |
25 std::unique_ptr<WmLayoutManager> wm_layout_manager) | 26 std::unique_ptr<WmLayoutManager> wm_layout_manager) |
26 : window_(window), wm_layout_manager_(std::move(wm_layout_manager)) { | 27 : window_(window), wm_layout_manager_(std::move(wm_layout_manager)) { |
27 window->SetProperty(kAuraLayoutManagerAdapter, this); | 28 window->SetProperty(kAuraLayoutManagerAdapter, this); |
28 } | 29 } |
29 | 30 |
30 AuraLayoutManagerAdapter::~AuraLayoutManagerAdapter() { | 31 AuraLayoutManagerAdapter::~AuraLayoutManagerAdapter() { |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 visible); | 64 visible); |
64 } | 65 } |
65 | 66 |
66 void AuraLayoutManagerAdapter::SetChildBounds( | 67 void AuraLayoutManagerAdapter::SetChildBounds( |
67 aura::Window* child, | 68 aura::Window* child, |
68 const gfx::Rect& requested_bounds) { | 69 const gfx::Rect& requested_bounds) { |
69 wm_layout_manager_->SetChildBounds(WmWindow::Get(child), requested_bounds); | 70 wm_layout_manager_->SetChildBounds(WmWindow::Get(child), requested_bounds); |
70 } | 71 } |
71 | 72 |
72 } // namespace ash | 73 } // namespace ash |
OLD | NEW |