| 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_tree_client.h" |
| 6 | 6 |
| 7 #include "ui/aura/env.h" | 7 #include "ui/aura/env.h" |
| 8 #include "ui/aura/root_window.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::WindowTreeClient*) |
| 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( |
| 17 WindowTreeClient*, kRootWindowWindowTreeClientKey, NULL); | 17 WindowTreeClient*, kRootWindowWindowTreeClientKey, NULL); |
| 18 | 18 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 42 // |context| must be attached to a hierarchy with a WindowTreeClient. | 42 // |context| must be attached to a hierarchy with a WindowTreeClient. |
| 43 WindowTreeClient* client = GetWindowTreeClient(context); | 43 WindowTreeClient* client = GetWindowTreeClient(context); |
| 44 DCHECK(client); | 44 DCHECK(client); |
| 45 Window* default_parent = | 45 Window* default_parent = |
| 46 client->GetDefaultParent(context, window, screen_bounds); | 46 client->GetDefaultParent(context, window, screen_bounds); |
| 47 default_parent->AddChild(window); | 47 default_parent->AddChild(window); |
| 48 } | 48 } |
| 49 | 49 |
| 50 } // namespace client | 50 } // namespace client |
| 51 } // namespace aura | 51 } // namespace aura |
| OLD | NEW |