chrome/browser/ui/webui/sync_setup_handler.cc - Issue 8334030: Merge search engines sync data type with Preferences. Sync the default search provider. Add some ...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/sync_setup_handler.cc

Issue 8334030: Merge search engines sync data type with Preferences. Sync the default search provider. Add some ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/sync/test/integration/sync_test.h ('K') | « chrome/browser/ui/webui/options/personal_options_handler.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/sync_setup_handler.cc

===================================================================

--- chrome/browser/ui/webui/sync_setup_handler.cc (revision 108905)

+++ chrome/browser/ui/webui/sync_setup_handler.cc (working copy)

@@ -124,12 +124,6 @@

if (sync_typed_urls)

config->data_types.insert(syncable::TYPED_URLS);

- bool sync_search_engines;

- if (!result->GetBoolean("syncSearchEngines", &sync_search_engines))

- return false;

- if (sync_search_engines)

- config->data_types.insert(syncable::SEARCH_ENGINES);

bool sync_sessions;

if (!result->GetBoolean("syncSessions", &sync_sessions))

return false;

@@ -330,7 +324,6 @@

{ "extensions", IDS_SYNC_DATATYPE_EXTENSIONS },

{ "typedURLs", IDS_SYNC_DATATYPE_TYPED_URLS },

{ "apps", IDS_SYNC_DATATYPE_APPS },

- { "searchEngines", IDS_SYNC_DATATYPE_SEARCH_ENGINES },

{ "openTabs", IDS_SYNC_DATATYPE_TABS },

{ "syncZeroDataTypesError", IDS_SYNC_ZERO_DATA_TYPES_ERROR },

{ "serviceUnavailableError", IDS_SYNC_SETUP_ABORTED_BY_PENDING_CLEAR },