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

Unified Diff: ui/aura_shell/toplevel_layout_manager_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/status_area_view.cc ('k') | ui/aura_shell/toplevel_window_event_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/toplevel_layout_manager_unittest.cc
===================================================================
--- ui/aura_shell/toplevel_layout_manager_unittest.cc (revision 113260)
+++ ui/aura_shell/toplevel_layout_manager_unittest.cc (working copy)
@@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "ui/aura/client/aura_constants.h"
-#include "ui/aura/desktop.h"
+#include "ui/aura/root_window.h"
#include "ui/aura/screen_aura.h"
#include "ui/aura/test/aura_test_base.h"
#include "ui/base/ui_base_types.h"
@@ -24,9 +24,9 @@
virtual void SetUp() OVERRIDE {
aura::test::AuraTestBase::SetUp();
- aura::Desktop::GetInstance()->screen()->set_work_area_insets(
+ aura::RootWindow::GetInstance()->screen()->set_work_area_insets(
gfx::Insets(1, 2, 3, 4));
- aura::Desktop::GetInstance()->SetHostSize(gfx::Size(500, 400));
+ aura::RootWindow::GetInstance()->SetHostSize(gfx::Size(500, 400));
container_.reset(new aura::Window(NULL));
container_->Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
container_->SetBounds(gfx::Rect(0, 0, 500, 500));
« no previous file with comments | « ui/aura_shell/status_area_view.cc ('k') | ui/aura_shell/toplevel_window_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698