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

Unified Diff: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

Issue 11368010: Move aura shared and desktop classes to the views target. Note that the files don't actually move, … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 | « no previous file | content/content_shell.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
===================================================================
--- chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc (revision 165738)
+++ chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc (working copy)
@@ -29,6 +29,7 @@
}
void ChromeBrowserMainExtraPartsAura::PreProfileInit() {
+#if !defined(OS_CHROMEOS)
#if defined(USE_ASH)
if (!chrome::ShouldOpenAshOnStartup())
#endif
@@ -38,6 +39,7 @@
aura::Env::GetInstance()->SetDisplayManager(new aura::SingleDisplayManager);
stacking_client_.reset(new aura::DesktopStackingClient);
}
+#endif
#if !defined(USE_ASH) && defined(OS_LINUX)
// TODO(erg): Refactor this into a dlopen call when we add a GTK3 port.
« no previous file with comments | « no previous file | content/content_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698