Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Unified Diff: chrome/browser/resources/sync_setup_overlay.js

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: Merge to TOT and fixed additional conflicts from rsimha. 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
Index: chrome/browser/resources/sync_setup_overlay.js
===================================================================
--- chrome/browser/resources/sync_setup_overlay.js (revision 109292)
+++ chrome/browser/resources/sync_setup_overlay.js (working copy)
@@ -249,7 +249,6 @@
"syncExtensions": syncAll || $('extensions-checkbox').checked,
"syncTypedUrls": syncAll || $('typed-urls-checkbox').checked,
"syncApps": syncAll || $('apps-checkbox').checked,
- "syncSearchEngines": syncAll || $('search-engines-checkbox').checked,
"syncSessions": syncAll || $('sessions-checkbox').checked,
"encryptAllData": encryptAllData,
"usePassphrase": usePassphrase,
@@ -344,12 +343,6 @@
} else {
$('apps-item').className = "sync-item-hide";
}
- if (args.searchEnginesRegistered) {
- $('search-engines-checkbox').checked = args.syncSearchEngines;
- $('search-engines-item').className = "sync-item-show";
- } else {
- $('search-engines-item').className = "sync-item-hide";
- }
if (args.sessionsRegistered) {
$('sessions-checkbox').checked = args.syncSessions;
$('sessions-item').className = "sync-item-show";
« no previous file with comments | « chrome/browser/resources/sync_setup_overlay.html ('k') | chrome/browser/search_engines/template_url_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698