Index: chrome/browser/ui/browser.cc |
=================================================================== |
--- chrome/browser/ui/browser.cc (revision 194196) |
+++ chrome/browser/ui/browser.cc (working copy) |
@@ -616,6 +616,15 @@ |
if (should_quit_if_last_browser && |
BrowserList::GetInstance(host_desktop_type_)->size() == 1) { |
+#if defined(OS_WIN) && defined(USE_AURA) |
+ // On Windows 8 browser windows could be open in ASH and in the desktop. We |
+ // should not start the shutdown process if browser windows are open in the |
+ // other environment. |
+ chrome::HostDesktopType other_desktop = |
+ (host_desktop_type_ == chrome::HOST_DESKTOP_TYPE_NATIVE ? |
+ chrome::HOST_DESKTOP_TYPE_ASH : chrome::HOST_DESKTOP_TYPE_NATIVE); |
+ if (BrowserList::GetInstance(other_desktop)->empty()) |
cpu_(ooo_6.6-7.5)
2013/04/17 21:37:44
should this change go into chrome/browser/lifetime
ananta
2013/04/17 22:03:06
Done. Added a function ShouldStartShutdown in appl
|
+#endif |
browser_shutdown::OnShutdownStarting(browser_shutdown::WINDOW_CLOSE); |
} |