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

Unified Diff: ui/aura_shell/toplevel_window_event_filter_unittest.cc

Issue 8771015: Rename Desktop->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/toplevel_window_event_filter.cc ('k') | ui/aura_shell/workspace/workspace.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/toplevel_window_event_filter_unittest.cc
===================================================================
--- ui/aura_shell/toplevel_window_event_filter_unittest.cc (revision 113260)
+++ ui/aura_shell/toplevel_window_event_filter_unittest.cc (working copy)
@@ -5,8 +5,8 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/aura/desktop.h"
#include "ui/aura/event.h"
+#include "ui/aura/root_window.h"
#include "ui/aura/test/aura_test_base.h"
#include "ui/aura/test/event_generator.h"
#include "ui/aura/test/test_stacking_client.h"
@@ -69,7 +69,7 @@
aura::test::AuraTestBase::SetUp();
aura::Window* default_container =
static_cast<aura::test::TestStackingClient*>(
- aura::Desktop::GetInstance()->stacking_client())->
+ aura::RootWindow::GetInstance()->stacking_client())->
default_container();
default_container->SetEventFilter(
new ToplevelWindowEventFilter(default_container));
« no previous file with comments | « ui/aura_shell/toplevel_window_event_filter.cc ('k') | ui/aura_shell/workspace/workspace.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698