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

Unified Diff: components/search_engines/template_url_service.cc

Issue 2659353002: Fix TemplateUrl::MatchesData comparison of search_terms_replacement_key (reland) (Closed)
Patch Set: Fixed after review, round 4 Created 3 years, 10 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: components/search_engines/template_url_service.cc
diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc
index 0e77d27379f265169564fc3bb4cf7eff964c7a4f..2acbee00febd0cefeda7427568f1bcb2344bb8a4 100644
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -692,7 +692,27 @@ void TemplateURLService::RepairPrepopulatedSearchEngines() {
// ApplyDefaultSearchChange will notify observers once it is done.
ApplyDefaultSearchChange(new_dse, source);
} else {
- NotifyObservers();
+ // Set fallback engine as user selected, because repair is considered a user
+ // action and we are expected to sync new fallback engine to other devices.
+ const TemplateURLData* fallback_engine_data =
+ default_search_manager_.GetFallbackSearchEngine();
+ if (fallback_engine_data) {
+ TemplateURL* fallback_engine =
+ FindPrepopulatedTemplateURL(fallback_engine_data->prepopulate_id);
+ if (fallback_engine) {
+ // Write fallback engine guid to sync pref. This will also set fallback
+ // engine as new user selected in
+ // OnSyncedDefaultSearchProviderGUIDChanged.
+ prefs_->SetString(prefs::kSyncedDefaultSearchProviderGUID,
+ fallback_engine->sync_guid());
+ } else {
+ // Fallback engine can not be found by prepopulate_id. Write its data
+ // to user pref.
+ default_search_manager_.SetUserSelectedDefaultSearchEngine(
+ *fallback_engine_data);
+ }
+ NotifyObservers();
+ }
}
}
@@ -1391,7 +1411,7 @@ void TemplateURLService::Init(const Initializer* initializers,
}
DefaultSearchManager::Source source = DefaultSearchManager::FROM_USER;
- TemplateURLData* dse =
+ const TemplateURLData* dse =
default_search_manager_.GetDefaultSearchEngine(&source);
ApplyDefaultSearchChange(dse, source);
@@ -1937,6 +1957,11 @@ bool TemplateURLService::ApplyDefaultSearchChangeNoMetrics(
source == DefaultSearchManager::FROM_POLICY ? data : nullptr);
}
+ // |default_search_provider_source_| must be set before calling
+ // UpdateNoNotify(), since that function needs to know the source of the
+ // update in question.
+ default_search_provider_source_ = source;
+
if (!data) {
default_search_provider_ = nullptr;
} else if (source == DefaultSearchManager::FROM_EXTENSION) {
@@ -1987,11 +2012,8 @@ bool TemplateURLService::ApplyDefaultSearchChangeNoMetrics(
prefs_->SetString(prefs::kSyncedDefaultSearchProviderGUID,
default_search_provider_->sync_guid());
}
-
}
- default_search_provider_source_ = source;
-
bool changed = default_search_provider_ != previous_default_search_engine;
if (changed)
RequestGoogleURLTrackerServerCheckIfNecessary();

Powered by Google App Engine
This is Rietveld 408576698