diff options
author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 23:12:29 +0000 |
---|---|---|
committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 23:12:29 +0000 |
commit | 5e349fb72b63bdd4a8ebd483238ad1c7cddae334 (patch) | |
tree | 7fba378e037af220b630c78397ca10a91e428378 /chrome/common | |
parent | 64f6f29d1f6309be0f5d7ede7db26fc566156f26 (diff) | |
download | chromium_src-5e349fb72b63bdd4a8ebd483238ad1c7cddae334.zip chromium_src-5e349fb72b63bdd4a8ebd483238ad1c7cddae334.tar.gz chromium_src-5e349fb72b63bdd4a8ebd483238ad1c7cddae334.tar.bz2 |
Store ChromeToMobile device list and timestamp prefs.
Store profile prefs and deprecate service-local storage.
(in preparation for new Sync Invalidation API integration)
Add kChromeToMobile[DeviceList|Timestamp] pref strings.
Add RegisterUserPrefs() static method and standard call.
Update/rename GetMobiles() and rename HasMobiles().
Update Mac unit test; misc minor cleanup and refactoring.
BUG=102709
TEST=Updated unit test; no Chrome To Mobile regressions.
Review URL: https://chromiumcodereview.appspot.com/10808068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147981 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r-- | chrome/common/pref_names.cc | 6 | ||||
-rw-r--r-- | chrome/common/pref_names.h | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index f95b3f0..9953cfd 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -1703,6 +1703,12 @@ const char kCloudPrintSigninDialogWidth[] = const char kCloudPrintSigninDialogHeight[] = "cloud_print.signin_dialog_size.height"; +#if !defined(OS_ANDROID) +// The Chrome To Mobile service prefs; the device list and last update time. +const char kChromeToMobileDeviceList[] = "chrome_to_mobile.device_list"; +const char kChromeToMobileTimestamp[] = "chrome_to_mobile.timestamp"; +#endif + // The list of BackgroundContents that should be loaded when the browser // launches. const char kRegisteredBackgroundContents[] = "background_contents.registered"; diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index d6fa1cd..c99f7b1 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -634,6 +634,11 @@ extern const char kCloudPrintRobotEmail[]; extern const char kVirtualPrinterDriverEnabled[]; extern const char kCloudPrintSubmitEnabled[]; +#if !defined(OS_ANDROID) +extern const char kChromeToMobileDeviceList[]; +extern const char kChromeToMobileTimestamp[]; +#endif + extern const char kProxy[]; extern const char kMaxConnectionsPerProxy[]; |