From e3225e03e88436787f9e215a24ff5e1d70eeeb65 Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Wed, 23 Oct 2013 20:44:37 +0000 Subject: 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 --- ash/display/screen_position_controller.cc | 1 - ash/display/screen_position_controller_unittest.cc | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'ash/display') diff --git a/ash/display/screen_position_controller.cc b/ash/display/screen_position_controller.cc index b416d38..60528ec 100644 --- a/ash/display/screen_position_controller.cc +++ b/ash/display/screen_position_controller.cc @@ -14,7 +14,6 @@ #include "ui/aura/client/activation_client.h" #include "ui/aura/client/capture_client.h" #include "ui/aura/client/focus_client.h" -#include "ui/aura/client/stacking_client.h" #include "ui/aura/root_window.h" #include "ui/aura/window_tracker.h" #include "ui/compositor/dip_util.h" 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); } -- cgit v1.1