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

Unified Diff: components/search_engines/util.h

Issue 2290503003: Remove use of stl_util in search_engines. (Closed)
Patch Set: ios for reals Created 4 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: components/search_engines/util.h
diff --git a/components/search_engines/util.h b/components/search_engines/util.h
index 6c235b96cf591fdc225914dbf24a6d8c42ffdc0e..08e421b2e9afc5abc2e794cd85eae092a088f8f7 100644
--- a/components/search_engines/util.h
+++ b/components/search_engines/util.h
@@ -78,7 +78,7 @@ struct ActionsFromPrepopulateData {
// NOTE: Takes ownership of, and clears, |prepopulated_urls|.
ActionsFromPrepopulateData CreateActionsFromCurrentPrepopulateData(
ScopedVector<TemplateURLData>* prepopulated_urls,
- const TemplateURLService::TemplateURLVector& existing_urls,
+ const TemplateURLService::OwnedTemplateURLVector& existing_urls,
const TemplateURL* default_search_provider);
// Processes the results of KeywordWebDataService::GetKeywords, combining it
@@ -97,7 +97,7 @@ void GetSearchProvidersUsingKeywordResult(
const WDTypedResult& result,
KeywordWebDataService* service,
PrefService* prefs,
- TemplateURLService::TemplateURLVector* template_urls,
+ TemplateURLService::OwnedTemplateURLVector* template_urls,
TemplateURL* default_search_provider,
const SearchTermsData& search_terms_data,
int* new_resource_keyword_version,
@@ -113,7 +113,7 @@ void GetSearchProvidersUsingKeywordResult(
void GetSearchProvidersUsingLoadedEngines(
KeywordWebDataService* service,
PrefService* prefs,
- TemplateURLService::TemplateURLVector* template_urls,
+ TemplateURLService::OwnedTemplateURLVector* template_urls,
TemplateURL* default_search_provider,
const SearchTermsData& search_terms_data,
int* resource_keyword_version,
@@ -133,8 +133,12 @@ void RemoveDuplicatePrepopulateIDs(
KeywordWebDataService* service,
const ScopedVector<TemplateURLData>& prepopulated_urls,
TemplateURL* default_search_provider,
- TemplateURLService::TemplateURLVector* template_urls,
+ TemplateURLService::OwnedTemplateURLVector* template_urls,
const SearchTermsData& search_terms_data,
std::set<std::string>* removed_keyword_guids);
+TemplateURLService::OwnedTemplateURLVector::iterator FindTemplateURL(
+ TemplateURLService::OwnedTemplateURLVector* urls,
+ TemplateURL* url);
+
#endif // COMPONENTS_SEARCH_ENGINES_UTIL_H_

Powered by Google App Engine
This is Rietveld 408576698