summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-06 08:41:19 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-06 08:41:19 +0000
commit017ec4bd5f21cc7cf052c417a69318a1cd43b4e0 (patch)
tree111660562c89946fe18b7b7dbc1700ef09773379 /chrome/common
parent427a09387bc17b2925d42294b930fe598667ef26 (diff)
downloadchromium_src-017ec4bd5f21cc7cf052c417a69318a1cd43b4e0.zip
chromium_src-017ec4bd5f21cc7cf052c417a69318a1cd43b4e0.tar.gz
chromium_src-017ec4bd5f21cc7cf052c417a69318a1cd43b4e0.tar.bz2
Added constants, strings, protos for app sync.
BUG=51225 TEST=none needed Review URL: http://codereview.chromium.org/3072022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/chrome_switches.cc6
-rw-r--r--chrome/common/chrome_switches.h2
-rw-r--r--chrome/common/pref_names.cc1
-rw-r--r--chrome/common/pref_names.h1
4 files changed, 10 insertions, 0 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 97ef576..454fffd 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -219,6 +219,9 @@ const char kDisableSiteSpecificQuirks[] = "disable-site-specific-quirks";
// Disable syncing browser data to a Google Account.
const char kDisableSync[] = "disable-sync";
+// Disable syncing of apps.
+const char kDisableSyncApps[] = "disable-sync-apps";
+
// Disable syncing of autofill.
const char kDisableSyncAutofill[] = "disable-sync-autofill";
@@ -404,6 +407,9 @@ const char kEnableStatsTable[] = "enable-stats-table";
// Enable syncing browser data to a Google Account.
const char kEnableSync[] = "enable-sync";
+// Enable syncing browser apps.
+const char kEnableSyncApps[] = "enable-sync-apps";
+
// Enable syncing browser autofill.
const char kEnableSyncAutofill[] = "enable-sync-autofill";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 50f75d4..cc69770 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -76,6 +76,7 @@ extern const char kDisableSessionStorage[];
extern const char kDisableSharedWorkers[];
extern const char kDisableSiteSpecificQuirks[];
extern const char kDisableSync[];
+extern const char kDisableSyncApps[];
extern const char kDisableSyncAutofill[];
extern const char kDisableSyncBookmarks[];
extern const char kDisableSyncExtensions[];
@@ -129,6 +130,7 @@ extern const char kEnableSearchProviderApiV2[];
extern const char kEnableSpeechInput[];
extern const char kEnableStatsTable[];
extern const char kEnableSync[];
+extern const char kEnableSyncApps[];
extern const char kEnableSyncAutofill[];
extern const char kEnableSyncBookmarks[];
extern const char kEnableSyncExtensions[];
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 72bb0c5..5759678 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -883,6 +883,7 @@ const wchar_t kKeepEverythingSynced[] = L"sync.keep_everything_synced";
const wchar_t kSyncBookmarks[] = L"sync.bookmarks";
const wchar_t kSyncPasswords[] = L"sync.passwords";
const wchar_t kSyncPreferences[] = L"sync.preferences";
+const wchar_t kSyncApps[] = L"sync.apps";
const wchar_t kSyncAutofill[] = L"sync.autofill";
const wchar_t kSyncThemes[] = L"sync.themes";
const wchar_t kSyncTypedUrls[] = L"sync.typed_urls";
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 44fbfdb..a522c34 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -318,6 +318,7 @@ extern const wchar_t kKeepEverythingSynced[];
extern const wchar_t kSyncBookmarks[];
extern const wchar_t kSyncPasswords[];
extern const wchar_t kSyncPreferences[];
+extern const wchar_t kSyncApps[];
extern const wchar_t kSyncAutofill[];
extern const wchar_t kSyncThemes[];
extern const wchar_t kSyncTypedUrls[];