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

Unified Diff: ui/views/examples/content_client/examples_browser_main_parts.cc

Issue 11418196: Fix example_browser_main_parts build failure on win/linux aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos build fix Created 8 years, 1 month 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 | « build/all.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(
« no previous file with comments | « build/all.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698