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

Unified Diff: chrome/test/base/ui_test_utils.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
Index: chrome/test/base/ui_test_utils.cc
===================================================================
--- chrome/test/base/ui_test_utils.cc (revision 113260)
+++ chrome/test/base/ui_test_utils.cc (working copy)
@@ -64,7 +64,7 @@
#endif
#if defined(USE_AURA)
-#include "ui/aura/desktop.h"
+#include "ui/aura/root_window.h"
#endif
static const int kDefaultWsPort = 8880;
@@ -253,7 +253,7 @@
loop->SetNestableTasksAllowed(true);
if (ui_loop) {
#if defined(USE_AURA)
- aura::Desktop::GetInstance()->Run();
+ aura::RootWindow::GetInstance()->Run();
#elif defined(TOOLKIT_VIEWS)
views::AcceleratorHandler handler;
ui_loop->RunWithDispatcher(&handler);
« no previous file with comments | « chrome/test/base/in_process_browser_test.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698