Rename StackingClient -> WindowTreeClient
Remove SetDefaultParentForRootWindow from Window, and replace with new utility function ParentWindowForContext in window_tree_client.h
This is part of my current campaign to slim down the aura Window types. I will eventually move WindowTreeClient to a new ui/wm component that I plan to create.
[email protected]
http://crbug.com/308844
Review URL: https://codereview.chromium.org/36473003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230501 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
index abdd514..f9d8986 100644
--- a/ui/aura/demo/demo_main.cc
+++ b/ui/aura/demo/demo_main.cc
@@ -9,7 +9,7 @@
#include "base/message_loop/message_loop.h"
#include "third_party/skia/include/core/SkXfermode.h"
#include "ui/aura/client/default_capture_client.h"
-#include "ui/aura/client/stacking_client.h"
+#include "ui/aura/client/window_tree_client.h"
#include "ui/aura/env.h"
#include "ui/aura/root_window.h"
#include "ui/aura/test/test_focus_client.h"
@@ -77,34 +77,33 @@
DISALLOW_COPY_AND_ASSIGN(DemoWindowDelegate);
};
-class DemoStackingClient : public aura::client::StackingClient {
+class DemoWindowTreeClient : public aura::client::WindowTreeClient {
public:
- explicit DemoStackingClient(aura::RootWindow* root_window)
- : root_window_(root_window) {
- aura::client::SetStackingClient(root_window_, this);
+ explicit DemoWindowTreeClient(aura::Window* window) : window_(window) {
+ aura::client::SetWindowTreeClient(window_, this);
}
- virtual ~DemoStackingClient() {
- aura::client::SetStackingClient(root_window_, NULL);
+ virtual ~DemoWindowTreeClient() {
+ aura::client::SetWindowTreeClient(window_, NULL);
}
- // Overridden from aura::client::StackingClient:
+ // Overridden from aura::client::WindowTreeClient:
virtual aura::Window* GetDefaultParent(aura::Window* context,
aura::Window* window,
const gfx::Rect& bounds) OVERRIDE {
if (!capture_client_) {
capture_client_.reset(
- new aura::client::DefaultCaptureClient(root_window_));
+ new aura::client::DefaultCaptureClient(window_->GetRootWindow()));
}
- return root_window_;
+ return window_;
}
private:
- aura::RootWindow* root_window_;
+ aura::Window* window_;
scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
- DISALLOW_COPY_AND_ASSIGN(DemoStackingClient);
+ DISALLOW_COPY_AND_ASSIGN(DemoWindowTreeClient);
};
int DemoMain() {
@@ -120,7 +119,7 @@
gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen.get());
scoped_ptr<aura::RootWindow> root_window(
test_screen->CreateRootWindowForPrimaryDisplay());
- scoped_ptr<DemoStackingClient> stacking_client(new DemoStackingClient(
+ scoped_ptr<DemoWindowTreeClient> window_tree_client(new DemoWindowTreeClient(
root_window.get()));
aura::test::TestFocusClient focus_client;
aura::client::SetFocusClient(root_window.get(), &focus_client);
@@ -132,7 +131,8 @@
window1.Init(ui::LAYER_TEXTURED);
window1.SetBounds(gfx::Rect(100, 100, 400, 400));
window1.Show();
- window1.SetDefaultParentByRootWindow(root_window.get(), gfx::Rect());
+ aura::client::ParentWindowWithContext(
+ &window1, root_window.get(), gfx::Rect());
DemoWindowDelegate window_delegate2(SK_ColorRED);
aura::Window window2(&window_delegate2);
@@ -140,7 +140,8 @@
window2.Init(ui::LAYER_TEXTURED);
window2.SetBounds(gfx::Rect(200, 200, 350, 350));
window2.Show();
- window2.SetDefaultParentByRootWindow(root_window.get(), gfx::Rect());
+ aura::client::ParentWindowWithContext(
+ &window2, root_window.get(), gfx::Rect());
DemoWindowDelegate window_delegate3(SK_ColorGREEN);
aura::Window window3(&window_delegate3);
