diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-23 20:44:37 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-23 20:44:37 +0000 |
| commit | e3225e03e88436787f9e215a24ff5e1d70eeeb65 (patch) | |
| tree | 5fb7d31be1e76201a49e23e86ccf39b1497c52e2 /ash/root_window_controller_unittest.cc | |
| parent | 9e00f36137ed67399711010ede7c74315237515f (diff) | |
| download | chromium_src-e3225e03e88436787f9e215a24ff5e1d70eeeb65.zip chromium_src-e3225e03e88436787f9e215a24ff5e1d70eeeb65.tar.gz chromium_src-e3225e03e88436787f9e215a24ff5e1d70eeeb65.tar.bz2 | |
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.
R=erg@chromium.org
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
Diffstat (limited to 'ash/root_window_controller_unittest.cc')
| -rw-r--r-- | ash/root_window_controller_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc index 70d9146..1de918c 100644 --- a/ash/root_window_controller_unittest.cc +++ b/ash/root_window_controller_unittest.cc @@ -17,6 +17,7 @@ #include "base/command_line.h" #include "ui/aura/client/focus_change_observer.h" #include "ui/aura/client/focus_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/event_generator.h" @@ -573,8 +574,8 @@ TEST_F(RootWindowControllerTest, DontDeleteWindowsNotOwnedByParent) { window1->set_owned_by_parent(false); observer1.SetWindow(window1); window1->Init(ui::LAYER_NOT_DRAWN); - window1->SetDefaultParentByRootWindow( - Shell::GetInstance()->GetPrimaryRootWindow(), gfx::Rect()); + aura::client::ParentWindowWithContext( + window1, Shell::GetInstance()->GetPrimaryRootWindow(), gfx::Rect()); DestroyedWindowObserver observer2; aura::Window* window2 = new aura::Window(NULL); |