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

Unified Diff: ui/aura_shell/examples/aura_shell_main.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/drag_drop_controller_unittest.cc ('k') | ui/aura_shell/examples/lock_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/examples/aura_shell_main.cc
===================================================================
--- ui/aura_shell/examples/aura_shell_main.cc (revision 113260)
+++ ui/aura_shell/examples/aura_shell_main.cc (working copy)
@@ -7,7 +7,7 @@
#include "base/i18n/icu_util.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "ui/aura/desktop.h"
+#include "ui/aura/root_window.h"
#include "ui/aura_shell/examples/toplevel_window.h"
#include "ui/aura_shell/launcher/launcher_types.h"
#include "ui/aura_shell/shell.h"
@@ -113,7 +113,7 @@
icu_util::Initialize();
ResourceBundle::InitSharedInstance("en-US");
- // Create the message-loop here before creating the desktop.
+ // Create the message-loop here before creating the root window.
MessageLoop message_loop(MessageLoop::TYPE_UI);
ui::CompositorTestSupport::Initialize();
@@ -121,9 +121,9 @@
aura_shell::examples::InitWindowTypeLauncher();
- aura::Desktop::GetInstance()->Run();
+ aura::RootWindow::GetInstance()->Run();
- aura::Desktop::DeleteInstance();
+ aura::RootWindow::DeleteInstance();
ui::CompositorTestSupport::Terminate();
« no previous file with comments | « ui/aura_shell/drag_drop_controller_unittest.cc ('k') | ui/aura_shell/examples/lock_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698