Index: ui/views/examples/content_client/examples_browser_main_parts.cc |
diff --git a/ui/views/examples/content_client/examples_browser_main_parts.cc b/ui/views/examples/content_client/examples_browser_main_parts.cc |
index 2c371f1a3cd9c7b93c3f4611c59cfca63eb024b4..e353b575f00f2084afe3e812a482df3531a4b7c9 100644 |
--- a/ui/views/examples/content_client/examples_browser_main_parts.cc |
+++ b/ui/views/examples/content_client/examples_browser_main_parts.cc |
@@ -20,7 +20,6 @@ |
#if defined(USE_AURA) |
#include "ui/aura/env.h" |
-#include "ui/aura/single_display_manager.h" |
#include "ui/gfx/screen.h" |
#include "ui/views/widget/desktop_aura/desktop_screen.h" |
#include "ui/views/widget/desktop_aura/desktop_stacking_client.h" |
@@ -40,8 +39,7 @@ ExamplesBrowserMainParts::~ExamplesBrowserMainParts() { |
void ExamplesBrowserMainParts::PreMainMessageLoopRun() { |
browser_context_.reset(new content::ShellBrowserContext(false)); |
-#if defined(USE_AURA) |
- aura::Env::GetInstance()->SetDisplayManager(new aura::SingleDisplayManager); |
+#if !defined(OS_CHROMEOS) && defined(USE_AURA) |
stacking_client_.reset(new DesktopStackingClient); |
aura::client::SetStackingClient(stacking_client_.get()); |
gfx::Screen::SetScreenInstance( |