summaryrefslogtreecommitdiffstats
path: root/ash/display/screen_position_controller_unittest.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-23 20:44:37 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-23 20:44:37 +0000
commite3225e03e88436787f9e215a24ff5e1d70eeeb65 (patch)
tree5fb7d31be1e76201a49e23e86ccf39b1497c52e2 /ash/display/screen_position_controller_unittest.cc
parent9e00f36137ed67399711010ede7c74315237515f (diff)
downloadchromium_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/display/screen_position_controller_unittest.cc')
-rw-r--r--ash/display/screen_position_controller_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/display/screen_position_controller_unittest.cc b/ash/display/screen_position_controller_unittest.cc
index 680ee83..2cd6133 100644
--- a/ash/display/screen_position_controller_unittest.cc
+++ b/ash/display/screen_position_controller_unittest.cc
@@ -56,7 +56,7 @@ class ScreenPositionControllerTest : public test::AshTestBase {
window_.reset(new aura::Window(&window_delegate_));
window_->SetType(aura::client::WINDOW_TYPE_NORMAL);
window_->Init(ui::LAYER_NOT_DRAWN);
- SetDefaultParentByPrimaryRootWindow(window_.get());
+ ParentWindowInPrimaryRootWindow(window_.get());
window_->set_id(1);
}