Index: ui/aura/client/window_parenting_client.cc |
diff --git a/ui/aura/client/window_tree_client.cc b/ui/aura/client/window_parenting_client.cc |
similarity index 52% |
rename from ui/aura/client/window_tree_client.cc |
rename to ui/aura/client/window_parenting_client.cc |
index 1b263c3e75622992ca88d209454a01c67d5e73a7..9d199b149db63bd14d2dc418114376a38b5c6aa6 100644 |
--- a/ui/aura/client/window_tree_client.cc |
+++ b/ui/aura/client/window_parenting_client.cc |
@@ -2,34 +2,37 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "ui/aura/client/window_tree_client.h" |
+#include "ui/aura/client/window_parenting_client.h" |
#include "ui/aura/env.h" |
#include "ui/aura/window_event_dispatcher.h" |
#include "ui/aura/window_property.h" |
-DECLARE_WINDOW_PROPERTY_TYPE(aura::client::WindowTreeClient*) |
+DECLARE_WINDOW_PROPERTY_TYPE(aura::client::WindowParentingClient*) |
namespace aura { |
namespace client { |
-DEFINE_WINDOW_PROPERTY_KEY( |
- WindowTreeClient*, kRootWindowWindowTreeClientKey, NULL); |
+DEFINE_WINDOW_PROPERTY_KEY(WindowParentingClient*, |
+ kRootWindowWindowParentingClientKey, |
+ NULL); |
-void SetWindowTreeClient(Window* window, WindowTreeClient* window_tree_client) { |
+void SetWindowParentingClient(Window* window, |
+ WindowParentingClient* window_tree_client) { |
DCHECK(window); |
Window* root_window = window->GetRootWindow(); |
DCHECK(root_window); |
- root_window->SetProperty(kRootWindowWindowTreeClientKey, window_tree_client); |
+ root_window->SetProperty(kRootWindowWindowParentingClientKey, |
+ window_tree_client); |
} |
-WindowTreeClient* GetWindowTreeClient(Window* window) { |
+WindowParentingClient* GetWindowParentingClient(Window* window) { |
DCHECK(window); |
Window* root_window = window->GetRootWindow(); |
DCHECK(root_window); |
- WindowTreeClient* client = |
- root_window->GetProperty(kRootWindowWindowTreeClientKey); |
+ WindowParentingClient* client = |
+ root_window->GetProperty(kRootWindowWindowParentingClientKey); |
DCHECK(client); |
return client; |
} |
@@ -39,8 +42,8 @@ void ParentWindowWithContext(Window* window, |
const gfx::Rect& screen_bounds) { |
DCHECK(context); |
- // |context| must be attached to a hierarchy with a WindowTreeClient. |
- WindowTreeClient* client = GetWindowTreeClient(context); |
+ // |context| must be attached to a hierarchy with a WindowParentingClient. |
+ WindowParentingClient* client = GetWindowParentingClient(context); |
DCHECK(client); |
Window* default_parent = |
client->GetDefaultParent(context, window, screen_bounds); |