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

Unified Diff: chrome/browser/browser_shutdown.cc

Issue 1376783004: Android: Mark more classes as non-mobile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix build 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
Index: chrome/browser/browser_shutdown.cc
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc
index a3669a620849d7fcd3b986f67dd25556e819ac3c..2a68357b43e11a82cb1710026283409692997f53 100644
--- a/chrome/browser/browser_shutdown.cc
+++ b/chrome/browser/browser_shutdown.cc
@@ -21,7 +21,6 @@
#include "base/time/time.h"
#include "chrome/browser/about_flags.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/first_run/upgrade_util.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/profiles/profile_metrics.h"
@@ -39,6 +38,10 @@
#include "chrome/browser/first_run/upgrade_util_win.h"
#endif
+#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
+#include "chrome/browser/first_run/upgrade_util.h"
+#endif
+
#if defined(ENABLE_RLZ)
#include "components/rlz/rlz_tracker.h"
#endif
@@ -246,7 +249,7 @@ void ShutdownPostThreadsStop(bool restart_last_session) {
#if defined(OS_WIN)
upgrade_util::RelaunchChromeWithMode(*new_cl.get(), g_relaunch_mode);
-#else
+#elif defined(OS_POSIX) && !defined(OS_ANDROID)
upgrade_util::RelaunchChromeBrowser(*new_cl.get());
#endif // defined(OS_WIN)

Powered by Google App Engine
This is Rietveld 408576698