diff options
| author | thestig <thestig@chromium.org> | 2015-10-05 15:08:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-05 22:10:23 +0000 |
| commit | d75ce55323b147ea665fbafdb0364d2103c32d30 (patch) | |
| tree | 0df23575b1c174fe8cf0957f3b539396c6f54019 /chrome/common/pref_names.h | |
| parent | 89b8f7d311f6616a7371b977ae0e7184151214df (diff) | |
| download | chromium_src-d75ce55323b147ea665fbafdb0364d2103c32d30.zip chromium_src-d75ce55323b147ea665fbafdb0364d2103c32d30.tar.gz chromium_src-d75ce55323b147ea665fbafdb0364d2103c32d30.tar.bz2 | |
Android: Stop building UpgradeDetector yet again.
This time, move the prefs that are not tied to it into other pref
registration functions.
Also ifdef out parts of BrowserProcessImpl and prefs that are not used
on Android.
BUG=159847,537076
Review URL: https://codereview.chromium.org/1377383004
Cr-Commit-Position: refs/heads/master@{#352441}
Diffstat (limited to 'chrome/common/pref_names.h')
| -rw-r--r-- | chrome/common/pref_names.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index 6e5bc6e..1eeaed3 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -509,7 +509,10 @@ extern const char kShutdownNumProcesses[]; extern const char kShutdownNumProcessesSlow[]; extern const char kRestartLastSessionOnShutdown[]; +#if !defined(OS_ANDROID) && !defined(OS_IOS) extern const char kWasRestarted[]; +#endif + #if defined(OS_WIN) extern const char kRelaunchMode[]; #endif @@ -709,11 +712,13 @@ extern const char kDebuggingFeaturesRequested[]; extern const char kResolveDeviceTimezoneByGeolocation[]; #endif // defined(OS_CHROMEOS) +#if !defined(OS_ANDROID) && !defined(OS_IOS) extern const char kAttemptedToEnableAutoupdate[]; extern const char kMediaGalleriesUniqueId[]; extern const char kMediaGalleriesRememberedGalleries[]; extern const char kMediaGalleriesLastScanTime[]; +#endif // !defined(OS_ANDROID) && !defined(OS_IOS) #if defined(USE_ASH) extern const char kShelfAlignment[]; |