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

Unified Diff: chrome/browser/lifetime/application_lifetime.cc

Issue 14576015: In WinAura, also kill the Metro viewer process in AttemptExit(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase on top of https://codereview.chromium.org/14576015/ Created 7 years, 7 months 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
Index: chrome/browser/lifetime/application_lifetime.cc
diff --git a/chrome/browser/lifetime/application_lifetime.cc b/chrome/browser/lifetime/application_lifetime.cc
index fdb60e77e04bd8041cb170c8c178fe002abd9b32..172c342a19a7d7b7c3699b2e220f0925809ad2d0 100644
--- a/chrome/browser/lifetime/application_lifetime.cc
+++ b/chrome/browser/lifetime/application_lifetime.cc
@@ -48,6 +48,11 @@
#include "chromeos/dbus/update_engine_client.h"
#endif
+#if defined(OS_WIN) && defined(USE_AURA)
+#include "base/win/windows_version.h"
+#include "chrome/browser/browser_process_platform_part_winaura.h"
+#endif
+
namespace chrome {
namespace {
@@ -103,6 +108,14 @@ void AttemptExitInternal() {
#else
// On most platforms, closing all windows causes the application to exit.
CloseAllBrowsers();
+#if defined(OS_WIN) && defined(USE_AURA)
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
+ // On Windows 8, Ash might be active in Metro and won't go away even if all
+ // browsers are closed. The viewer process, whose host holds a reference to
+ // g_browser_process, needs to be killed.
+ g_browser_process->platform_part()->TerminateMetroViewerProcess();
sky 2013/05/15 21:13:18 How about naming this AttemptExit so that you can
gab 2013/05/17 23:19:18 Done on top of https://codereview.chromium.org/149
+ }
+#endif // defined(OS_WIN) && defined(USE_AURA)
#endif
}
« no previous file with comments | « chrome/browser/browser_process_platform_part_winaura.cc ('k') | chrome/browser/metro_viewer/metro_viewer_process_host_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698