OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "ui/aura/client/window_tree_client.h" | 5 #include "ui/aura/client/window_parenting_client.h" |
6 | 6 |
7 #include "ui/aura/env.h" | 7 #include "ui/aura/env.h" |
8 #include "ui/aura/window_event_dispatcher.h" | 8 #include "ui/aura/window_event_dispatcher.h" |
9 #include "ui/aura/window_property.h" | 9 #include "ui/aura/window_property.h" |
10 | 10 |
11 DECLARE_WINDOW_PROPERTY_TYPE(aura::client::WindowTreeClient*) | 11 DECLARE_WINDOW_PROPERTY_TYPE(aura::client::WindowParentingClient*) |
12 | 12 |
13 namespace aura { | 13 namespace aura { |
14 namespace client { | 14 namespace client { |
15 | 15 |
16 DEFINE_WINDOW_PROPERTY_KEY( | 16 DEFINE_WINDOW_PROPERTY_KEY(WindowParentingClient*, |
17 WindowTreeClient*, kRootWindowWindowTreeClientKey, NULL); | 17 kRootWindowWindowParentingClientKey, |
| 18 NULL); |
18 | 19 |
19 void SetWindowTreeClient(Window* window, WindowTreeClient* window_tree_client) { | 20 void SetWindowParentingClient(Window* window, |
| 21 WindowParentingClient* window_tree_client) { |
20 DCHECK(window); | 22 DCHECK(window); |
21 | 23 |
22 Window* root_window = window->GetRootWindow(); | 24 Window* root_window = window->GetRootWindow(); |
23 DCHECK(root_window); | 25 DCHECK(root_window); |
24 root_window->SetProperty(kRootWindowWindowTreeClientKey, window_tree_client); | 26 root_window->SetProperty(kRootWindowWindowParentingClientKey, |
| 27 window_tree_client); |
25 } | 28 } |
26 | 29 |
27 WindowTreeClient* GetWindowTreeClient(Window* window) { | 30 WindowParentingClient* GetWindowParentingClient(Window* window) { |
28 DCHECK(window); | 31 DCHECK(window); |
29 Window* root_window = window->GetRootWindow(); | 32 Window* root_window = window->GetRootWindow(); |
30 DCHECK(root_window); | 33 DCHECK(root_window); |
31 WindowTreeClient* client = | 34 WindowParentingClient* client = |
32 root_window->GetProperty(kRootWindowWindowTreeClientKey); | 35 root_window->GetProperty(kRootWindowWindowParentingClientKey); |
33 DCHECK(client); | 36 DCHECK(client); |
34 return client; | 37 return client; |
35 } | 38 } |
36 | 39 |
37 void ParentWindowWithContext(Window* window, | 40 void ParentWindowWithContext(Window* window, |
38 Window* context, | 41 Window* context, |
39 const gfx::Rect& screen_bounds) { | 42 const gfx::Rect& screen_bounds) { |
40 DCHECK(context); | 43 DCHECK(context); |
41 | 44 |
42 // |context| must be attached to a hierarchy with a WindowTreeClient. | 45 // |context| must be attached to a hierarchy with a WindowParentingClient. |
43 WindowTreeClient* client = GetWindowTreeClient(context); | 46 WindowParentingClient* client = GetWindowParentingClient(context); |
44 DCHECK(client); | 47 DCHECK(client); |
45 Window* default_parent = | 48 Window* default_parent = |
46 client->GetDefaultParent(context, window, screen_bounds); | 49 client->GetDefaultParent(context, window, screen_bounds); |
47 default_parent->AddChild(window); | 50 default_parent->AddChild(window); |
48 } | 51 } |
49 | 52 |
50 } // namespace client | 53 } // namespace client |
51 } // namespace aura | 54 } // namespace aura |
OLD | NEW |