Index: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc |
diff --git a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc |
index a63ebce3c490bbd109481c24ef43a0011bf3fc15..4eeee367f2c74a32a67d52ce3bda309a4cd2a09e 100644 |
--- a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc |
+++ b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc |
@@ -49,13 +49,7 @@ ChromeBrowserMainExtraPartsAura::~ChromeBrowserMainExtraPartsAura() { |
} |
void ChromeBrowserMainExtraPartsAura::ToolkitInitialized() { |
-#if !defined(OS_CHROMEOS) |
-#if defined(USE_ASH) |
- active_desktop_monitor_.reset(new ActiveDesktopMonitor(GetInitialDesktop())); |
-#endif |
-#endif |
- |
-#if !defined(USE_ASH) && defined(OS_LINUX) && defined(USE_X11) |
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
// TODO(erg): Refactor this into a dlopen call when we add a GTK3 port. |
views::LinuxUI::SetInstance(BuildGtk2UI()); |
#endif |
@@ -64,6 +58,7 @@ void ChromeBrowserMainExtraPartsAura::ToolkitInitialized() { |
void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopStart() { |
#if !defined(OS_CHROMEOS) |
#if defined(USE_ASH) |
+ active_desktop_monitor_.reset(new ActiveDesktopMonitor(GetInitialDesktop())); |
sky
2013/09/30 14:45:53
How come you're moving initialization of this from
Elliot Glaysher
2013/09/30 20:53:40
Because using ActiveDesktopMonitor required aura::
|
if (!chrome::ShouldOpenAshOnStartup()) |
#endif |
{ |