Index: chrome/browser/chrome_browser_main_extra_parts_aura.cc |
diff --git a/chrome/browser/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/chrome_browser_main_extra_parts_aura.cc |
index 97e9dc64568866bbc38c532569df3da114dd5254..693b5f369eea60b40e583c71c4c41406e239827c 100644 |
--- a/chrome/browser/chrome_browser_main_extra_parts_aura.cc |
+++ b/chrome/browser/chrome_browser_main_extra_parts_aura.cc |
@@ -6,11 +6,26 @@ |
#include "ui/aura/env.h" |
+#if !defined(USE_ASH) |
+#include "ui/aura/desktop/desktop_stacking_client.h" |
+#include "ui/views/widget/native_widget_aura.h" |
+#endif // !USE_ASH |
+ |
ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura() |
: ChromeBrowserMainExtraParts() { |
} |
+void ChromeBrowserMainExtraPartsAura::PreProfileInit() { |
+#if !defined(USE_ASH) |
+ stacking_client_.reset(new aura::DesktopStackingClient); |
+#endif // !USE_ASH |
+} |
+ |
void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() { |
+#if !defined(USE_ASH) |
+ stacking_client_.reset(); |
+#endif |
+ |
// aura::Env instance is deleted in BrowserProcessImpl::StartTearDown |
// after the metrics service is deleted. |
} |