Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(88)

Unified Diff: ui/aura_shell/workspace_controller_unittest.cc

Issue 8916020: Second attempt at moving the StackingClient to a property on the RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura_shell/workspace/workspace_manager_unittest.cc ('k') | ui/views/test/views_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/workspace_controller_unittest.cc
===================================================================
--- ui/aura_shell/workspace_controller_unittest.cc (revision 114527)
+++ ui/aura_shell/workspace_controller_unittest.cc (working copy)
@@ -5,7 +5,7 @@
#include "ui/aura_shell/workspace_controller.h"
#include "ui/aura/test/aura_test_base.h"
-#include "ui/aura/test/test_stacking_client.h"
+#include "ui/aura/root_window.h"
#include "ui/aura/window.h"
#include "ui/aura_shell/activation_controller.h"
#include "ui/aura_shell/shell_window_ids.h"
@@ -25,7 +25,7 @@
virtual void SetUp() OVERRIDE {
aura::test::AuraTestBase::SetUp();
- contents_view_ = GetTestStackingClient()->default_container();
+ contents_view_ = aura::RootWindow::GetInstance();
// Activatable windows need to be in a container the ActivationController
// recognizes.
contents_view_->set_id(
« no previous file with comments | « ui/aura_shell/workspace/workspace_manager_unittest.cc ('k') | ui/views/test/views_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698