diff options
Diffstat (limited to 'ash/display')
-rw-r--r-- | ash/display/screen_position_controller.cc | 1 | ||||
-rw-r--r-- | ash/display/screen_position_controller_unittest.cc | 2 |
2 files changed, 1 insertions, 2 deletions
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); } |