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

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

Issue 1884543004: Android: Avoid linking with --gc-sections. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « chrome/android/chrome_apk.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/lifetime/application_lifetime.cc
diff --git a/chrome/browser/lifetime/application_lifetime.cc b/chrome/browser/lifetime/application_lifetime.cc
index 8bd06e9b4f849582328e480af9eaeb6a9b5fc656..4caf166318e9158b9c69742ebee39554c1d3c51f 100644
--- a/chrome/browser/lifetime/application_lifetime.cc
+++ b/chrome/browser/lifetime/application_lifetime.cc
@@ -79,11 +79,13 @@ bool g_send_stop_request_to_session_manager = false;
} // namespace
+#if !defined(OS_ANDROID)
void MarkAsCleanShutdown() {
// TODO(beng): Can this use ProfileManager::GetLoadedProfiles() instead?
for (auto* browser : *BrowserList::GetInstance())
browser->profile()->SetExitType(Profile::EXIT_NORMAL);
}
+#endif
void AttemptExitInternal(bool try_to_quit_application) {
// On Mac, the platform-specific part handles setting this.
@@ -172,11 +174,13 @@ void AttemptUserExit() {
#else
// Reset the restart bit that might have been set in cancelled restart
// request.
+#if !defined(OS_ANDROID)
UserManager::Hide();
+#endif
PrefService* pref_service = g_browser_process->local_state();
pref_service->SetBoolean(prefs::kRestartLastSessionOnShutdown, false);
AttemptExitInternal(false);
-#endif
+#endif // defined(OS_CHROMEOS)
}
// The Android implementation is in application_lifetime_android.cc
« no previous file with comments | « chrome/android/chrome_apk.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698