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

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

Issue 1684043002: Fix build failure of chrome_public_apk on Android GN build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: +#endif comment Created 4 years, 10 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/lifetime/application_lifetime.h ('k') | chrome/browser/usb/usb_tab_helper.h » ('j') | 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 856e250c9e8387271bebc6f3838ece965ff553ec..cdcbe41e19fb8adfe4a8350f6995920cf08036c3 100644
--- a/chrome/browser/lifetime/application_lifetime.cc
+++ b/chrome/browser/lifetime/application_lifetime.cc
@@ -69,10 +69,10 @@ bool AreAllBrowsersCloseable() {
}
return true;
}
-#endif // !defined(OS_ANDROID)
int g_keep_alive_count = 0;
bool g_disable_shutdown_for_testing = false;
+#endif // !defined(OS_ANDROID)
#if defined(OS_CHROMEOS)
// Whether chrome should send stop request to a session manager.
@@ -102,6 +102,7 @@ void AttemptExitInternal(bool try_to_quit_application) {
g_browser_process->platform_part()->AttemptExit();
}
+#if !defined(OS_ANDROID)
void CloseAllBrowsersAndQuit() {
browser_shutdown::SetTryingToQuit(true);
CloseAllBrowsers();
@@ -136,6 +137,7 @@ void CloseAllBrowsers() {
new BrowserCloseManager;
browser_close_manager->StartClosingBrowsers();
}
+#endif // !defined(OS_ANDROID)
void AttemptUserExit() {
#if defined(OS_CHROMEOS)
@@ -233,6 +235,7 @@ void ExitCleanly() {
}
#endif
+#if !defined(OS_ANDROID)
void SessionEnding() {
// This is a time-limited shutdown where we need to write as much to
// disk as we can as soon as we can, and where we must kill the
@@ -308,6 +311,7 @@ void DecrementKeepAliveCount() {
bool WillKeepAlive() {
return g_keep_alive_count > 0;
}
+#endif // !defined(OS_ANDROID)
void NotifyAppTerminating() {
static bool notified = false;
@@ -358,6 +362,7 @@ void NotifyAndTerminate(bool fast_path) {
#endif
}
+#if !defined(OS_ANDROID)
void OnAppExiting() {
static bool notified = false;
if (notified)
@@ -371,5 +376,6 @@ void DisableShutdownForTesting(bool disable_shutdown_for_testing) {
if (!g_disable_shutdown_for_testing && !WillKeepAlive())
CloseAllBrowsersIfNeeded();
}
+#endif // !defined(OS_ANDROID)
} // namespace chrome
« no previous file with comments | « chrome/browser/lifetime/application_lifetime.h ('k') | chrome/browser/usb/usb_tab_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698