| 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.
|
|
|