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

Unified Diff: ui/aura/demo/demo_main.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 | « ui/aura/aura.gyp ('k') | ui/aura/single_monitor_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/demo/demo_main.cc
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
index 7291c60cd0fbb8e726f6d1edffb228afba50d715..c4782b0fb320b1a45368b5569de9203bc620cb7e 100644
--- a/ui/aura/demo/demo_main.cc
+++ b/ui/aura/demo/demo_main.cc
@@ -11,7 +11,7 @@
#include "ui/aura/client/stacking_client.h"
#include "ui/aura/env.h"
#include "ui/aura/event.h"
-#include "ui/aura/monitor_manager.h"
+#include "ui/aura/single_monitor_manager.h"
#include "ui/aura/root_window.h"
#include "ui/aura/window.h"
#include "ui/aura/window_delegate.h"
@@ -111,7 +111,7 @@ int main(int argc, char** argv) {
// Create the message-loop here before creating the root window.
MessageLoop message_loop(MessageLoop::TYPE_UI);
ui::CompositorTestSupport::Initialize();
-
+ aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager);
scoped_ptr<aura::RootWindow> root_window(
aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
scoped_ptr<DemoStackingClient> stacking_client(new DemoStackingClient(
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/aura/single_monitor_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698