diff options
author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-26 22:07:17 +0000 |
---|---|---|
committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-26 22:07:17 +0000 |
commit | 6892e2e416250521ed0778206da0093388b99300 (patch) | |
tree | 84d80407cbfa15cec3214d6d2822e74143a79ce6 /chrome/common | |
parent | 46fe10d6c3cc0433626007f93c2b7784a2889ada (diff) | |
download | chromium_src-6892e2e416250521ed0778206da0093388b99300.zip chromium_src-6892e2e416250521ed0778206da0093388b99300.tar.gz chromium_src-6892e2e416250521ed0778206da0093388b99300.tar.bz2 |
Revert "Revert 84829 - Initial implementation of "Synced Bookmarks" folder."
Second attempt to land this change. Fixes memory leak (82186),
deleted bookmarks (82273) and crash on add bookmarks in windows (82349).
Original desscription:
Mostly ensures that sycned bookmarks are correctly treated as an immutable
folder. Some of the UI-bits maybe incomplete. For example, if
enable-synced-bookmarks-folder is set, then synced bookmarks will appear in the
bookmark manager page and some components of the UI but it's not on the bookmark
bar or anything like that. This change also ensures that the synced bookmark
folder matches a sync folder if one is available.
BUG=
TEST=test bookmark addition/moving around in combination with sync
Review URL: http://codereview.chromium.org/7012005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86902 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r-- | chrome/common/chrome_switches.cc | 3 | ||||
-rw-r--r-- | chrome/common/chrome_switches.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 059f378..16765cd 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -514,6 +514,9 @@ const char kEnableTabGroupsContextMenu[] = "enable-tab-groups-context-menu"; // Enable syncing browser typed urls. const char kEnableSyncTypedUrls[] = "enable-sync-typed-urls"; +// Enable syncing browser typed urls. +const char kEnableSyncedBookmarksFolder[] = "enable-synced-bookmarks-folder"; + // Enable use of experimental TCP sockets API for sending data in the // SYN packet. const char kEnableTcpFastOpen[] = "enable-tcp-fastopen"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index b8626ae..9d51607 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -153,6 +153,7 @@ extern const char kEnableSyncEncryption[]; extern const char kEnableSyncPreferences[]; extern const char kEnableSyncSessions[]; extern const char kEnableSyncTypedUrls[]; +extern const char kEnableSyncedBookmarksFolder[]; extern const char kEnableTabGroupsContextMenu[]; extern const char kEnableTcpFastOpen[]; extern const char kEnableTopSites[]; |