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

Unified Diff: ui/aura_shell/examples/lock_view.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/examples/aura_shell_main.cc ('k') | ui/aura_shell/examples/window_type_launcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/examples/lock_view.cc
===================================================================
--- ui/aura_shell/examples/lock_view.cc (revision 113260)
+++ ui/aura_shell/examples/lock_view.cc (working copy)
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/utf_string_conversions.h"
-#include "ui/aura/desktop.h"
+#include "ui/aura/root_window.h"
#include "ui/aura/window.h"
#include "ui/aura_shell/examples/example_factory.h"
#include "ui/aura_shell/shell.h"
@@ -54,9 +54,9 @@
views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL);
gfx::Size ps = lock_view->GetPreferredSize();
- gfx::Size desktop_size = aura::Desktop::GetInstance()->GetHostSize();
- params.bounds = gfx::Rect((desktop_size.width() - ps.width()) / 2,
- (desktop_size.height() - ps.height()) / 2,
+ gfx::Size root_window_size = aura::RootWindow::GetInstance()->GetHostSize();
+ params.bounds = gfx::Rect((root_window_size.width() - ps.width()) / 2,
+ (root_window_size.height() - ps.height()) / 2,
ps.width(), ps.height());
params.delegate = lock_view;
widget->Init(params);
« no previous file with comments | « ui/aura_shell/examples/aura_shell_main.cc ('k') | ui/aura_shell/examples/window_type_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698