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

Unified Diff: chrome/browser/browser_shutdown.cc

Issue 1376683003: Android: Mark some profile code as non-mobile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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/browser/browser_shutdown.h ('k') | chrome/browser/profiles/profile_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_shutdown.cc
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc
index 2a68357b43e11a82cb1710026283409692997f53..881d4812eaae6a88434360df0c8d5afc4c4e12a3 100644
--- a/chrome/browser/browser_shutdown.cc
+++ b/chrome/browser/browser_shutdown.cc
@@ -142,6 +142,7 @@ base::FilePath GetShutdownMsPath() {
return shutdown_ms_file.AppendASCII(kShutdownMsFile);
}
+#if !defined(OS_ANDROID)
bool ShutdownPreThreadsStop() {
#if defined(OS_CHROMEOS)
chromeos::BootTimesRecorder::Get()->AddLogoutTimeMarker(
@@ -249,7 +250,7 @@ void ShutdownPostThreadsStop(bool restart_last_session) {
#if defined(OS_WIN)
upgrade_util::RelaunchChromeWithMode(*new_cl.get(), g_relaunch_mode);
-#elif defined(OS_POSIX) && !defined(OS_ANDROID)
+#elif defined(OS_POSIX)
upgrade_util::RelaunchChromeBrowser(*new_cl.get());
#endif // defined(OS_WIN)
@@ -274,6 +275,7 @@ void ShutdownPostThreadsStop(bool restart_last_session) {
chrome::NotifyAndTerminate(false);
#endif
}
+#endif // !defined(OS_ANDROID)
void ReadLastShutdownFile(ShutdownType type,
int num_procs,
« no previous file with comments | « chrome/browser/browser_shutdown.h ('k') | chrome/browser/profiles/profile_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698