summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-18 00:27:29 +0000
committerzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-18 00:27:29 +0000
commit5315025a1176b7f077b4bf8d2a963e63ea87f988 (patch)
tree32383a62a01d8609f0be2e01fd3be5fd4b9895cf /chrome/common
parent7a1c45fe4cb3c4abdd85aa09fa12886ca2fc7be8 (diff)
downloadchromium_src-5315025a1176b7f077b4bf8d2a963e63ea87f988.zip
chromium_src-5315025a1176b7f077b4bf8d2a963e63ea87f988.tar.gz
chromium_src-5315025a1176b7f077b4bf8d2a963e63ea87f988.tar.bz2
Update sync to support syncing of typed urls
Review URL: http://codereview.chromium.org/896001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41901 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
2 files changed, 8 insertions, 0 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index e3bc887..56528c6 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -174,6 +174,9 @@ const char kDisableSyncBookmarks[] = "disable-sync-bookmarks";
// Disable syncing of preferences.
const char kDisableSyncPreferences[] = "disable-sync-preferences";
+// Disable syncing of typed urls.
+const char kDisableSyncTypedUrls[] = "disable-sync-typed-urls";
+
// Enables the backend service for web resources, used in the new tab page for
// loading tips and recommendations from a JSON feed.
const char kDisableWebResources[] = "disable-web-resources";
@@ -291,6 +294,9 @@ const char kEnableSyncBookmarks[] = "enable-sync-bookmarks";
// Enable syncing browser preferences.
const char kEnableSyncPreferences[] = "enable-sync-preferences";
+// Enable syncing browser typed urls.
+const char kEnableSyncTypedUrls[] = "enable-sync-typed-urls";
+
// Enable the tabbed bookmark manager
const char kEnableTabbedBookmarkManager[] = "enable-tabbed-bookmark-manager";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index eb3b06e..134df40 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -65,6 +65,7 @@ extern const char kDisableSync[];
extern const char kDisableSyncAutofill[];
extern const char kDisableSyncBookmarks[];
extern const char kDisableSyncPreferences[];
+extern const char kDisableSyncTypedUrls[];
extern const char kDisableWebResources[];
extern const char kDisableWebSecurity[];
extern const char kDisableWebSockets[];
@@ -99,6 +100,7 @@ extern const char kEnableSync[];
extern const char kEnableSyncAutofill[];
extern const char kEnableSyncBookmarks[];
extern const char kEnableSyncPreferences[];
+extern const char kEnableSyncTypedUrls[];
extern const char kEnableTabbedBookmarkManager[];
extern const char kEnableUserDataDirProfiles[];
extern const char kEnableUserStyleSheet[];