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

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: merge up to r201426 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..87109c50dde29690f17d109ce13b96852865cc72 100644
--- a/chrome/browser/lifetime/application_lifetime.cc
+++ b/chrome/browser/lifetime/application_lifetime.cc
@@ -12,6 +12,7 @@
#include "base/prefs/pref_service.h"
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/browser_shutdown.h"
#include "chrome/browser/download/download_service.h"
#include "chrome/browser/metrics/thread_watcher.h"
@@ -31,14 +32,6 @@
#include "content/public/browser/navigation_details.h"
#include "content/public/browser/notification_service.h"
-#if defined(OS_ANDROID)
-#include "chrome/browser/lifetime/application_lifetime_android.h"
-#endif
-
-#if defined(OS_MACOSX)
-#include "chrome/browser/chrome_browser_application_mac.h"
-#endif
-
#if defined(OS_CHROMEOS)
#include "base/chromeos/chromeos_version.h"
#include "chrome/browser/chromeos/boot_times_loader.h"
@@ -92,18 +85,7 @@ void AttemptExitInternal() {
content::NotificationService::AllSources(),
content::NotificationService::NoDetails());
-#if defined(OS_ANDROID)
- // Tell the Java code to finish() the Activity.
- TerminateAndroid();
-#elif defined(OS_MACOSX)
- // On the Mac, the application continues to run once all windows are closed.
- // Terminate will result in a CloseAllBrowsers() call, and once (and if)
- // that is done, will cause the application to exit cleanly.
- chrome_browser_application_mac::Terminate();
-#else
- // On most platforms, closing all windows causes the application to exit.
- CloseAllBrowsers();
-#endif
+ g_browser_process->platform_part()->AttemptExit();
}
void CloseAllBrowsers() {
« no previous file with comments | « chrome/browser/browser_process_platform_part_mac.mm ('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