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

Unified Diff: chrome/browser/search_engines/template_url_service.cc

Issue 7669052: Added DataTypeController integration and UI surfacing for syncing Search Engines. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixed notification registration. Created 9 years, 4 months 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/search_engines/template_url_service.cc
===================================================================
--- chrome/browser/search_engines/template_url_service.cc (revision 98647)
+++ chrome/browser/search_engines/template_url_service.cc (working copy)
@@ -867,11 +867,9 @@
turl.suggestions_url()->url() : std::string());
se_specifics->set_prepopulate_id(turl.prepopulate_id());
se_specifics->set_autogenerate_keyword(turl.autogenerate_keyword());
- se_specifics->set_logo_id(turl.logo_id());
se_specifics->set_created_by_policy(turl.created_by_policy());
se_specifics->set_instant_url(turl.instant_url() ?
turl.instant_url()->url() : std::string());
- se_specifics->set_id(turl.id());
se_specifics->set_last_modified(turl.last_modified().ToInternalValue());
se_specifics->set_sync_guid(turl.sync_guid());
return SyncData::CreateLocalData(se_specifics->sync_guid(),
@@ -900,10 +898,8 @@
turl->SetSuggestionsURL(specifics.suggestions_url(), 0, 0);
turl->SetPrepopulateId(specifics.prepopulate_id());
turl->set_autogenerate_keyword(specifics.autogenerate_keyword());
- turl->set_logo_id(specifics.logo_id());
turl->set_created_by_policy(specifics.created_by_policy());
turl->SetInstantURL(specifics.instant_url(), 0, 0);
- turl->set_id(specifics.id());
turl->set_last_modified(
base::Time::FromInternalValue(specifics.last_modified()));
turl->set_sync_guid(specifics.sync_guid());
@@ -1522,6 +1518,10 @@
if (service_.get())
service_->SetDefaultSearchProvider(url);
+
+ // Inform sync the change to the show_in_default_list flag.
+ if (url)
+ ProcessTemplateURLChange(url, SyncChange::ACTION_UPDATE);
}
void TemplateURLService::AddNoNotify(TemplateURL* template_url) {
« no previous file with comments | « chrome/browser/resources/sync_setup_overlay.js ('k') | chrome/browser/search_engines/template_url_service_sync_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698