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

Unified Diff: content/test/test_renderer_host.cc

Issue 10082008: Aura demo fix (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: export Created 8 years, 8 months 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 | « chrome/test/base/browser_with_test_window_test.cc ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/test_renderer_host.cc
diff --git a/content/test/test_renderer_host.cc b/content/test/test_renderer_host.cc
index 2185678c5e847bec3e55334d6f84ab7bf3fd3631..ea9dce7652944b21355a70d24c40b3b8fa9f94aa 100644
--- a/content/test/test_renderer_host.cc
+++ b/content/test/test_renderer_host.cc
@@ -21,7 +21,7 @@
#include "ui/aura/env.h"
#include "ui/aura/monitor_manager.h"
#include "ui/aura/root_window.h"
-#include "ui/aura/test/single_monitor_manager.h"
+#include "ui/aura/single_monitor_manager.h"
#include "ui/aura/test/test_stacking_client.h"
#endif
@@ -195,8 +195,7 @@ void RenderViewHostTestHarness::Reload() {
void RenderViewHostTestHarness::SetUp() {
#if defined(USE_AURA)
- aura::Env::GetInstance()->SetMonitorManager(
- new aura::test::SingleMonitorManager);
+ aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager);
root_window_.reset(aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
#if defined(USE_ASH)
gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));
« no previous file with comments | « chrome/test/base/browser_with_test_window_test.cc ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698