| Index: chrome/browser/search_engines/template_url_prepopulate_data.cc
|
| diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.cc b/chrome/browser/search_engines/template_url_prepopulate_data.cc
|
| index 064b65e190dc63943b295e81a75e0df75c8e845a..966b4a71b77a3fe3b024c4649a33e5a6015a22e5 100644
|
| --- a/chrome/browser/search_engines/template_url_prepopulate_data.cc
|
| +++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc
|
| @@ -1077,6 +1077,7 @@ TemplateURL* MakePrepopulatedTemplateURL(
|
| const base::StringPiece& suggest_url,
|
| const base::StringPiece& instant_url,
|
| const base::StringPiece& image_url,
|
| + const base::StringPiece& new_tab_url,
|
| const base::StringPiece& search_url_post_params,
|
| const base::StringPiece& suggest_url_post_params,
|
| const base::StringPiece& instant_url_post_params,
|
| @@ -1095,6 +1096,7 @@ TemplateURL* MakePrepopulatedTemplateURL(
|
| data.suggestions_url = suggest_url.as_string();
|
| data.instant_url = instant_url.as_string();
|
| data.image_url = image_url.as_string();
|
| + data.new_tab_url = new_tab_url.as_string();
|
| data.search_url_post_params = search_url_post_params.as_string();
|
| data.suggestions_url_post_params = suggest_url_post_params.as_string();
|
| data.instant_url_post_params = instant_url_post_params.as_string();
|
| @@ -1148,6 +1150,7 @@ void GetPrepopulatedTemplateFromPrefs(Profile* profile,
|
| std::string suggest_url;
|
| std::string instant_url;
|
| std::string image_url;
|
| + std::string new_tab_url;
|
| std::string search_url_post_params;
|
| std::string suggest_url_post_params;
|
| std::string instant_url_post_params;
|
| @@ -1158,6 +1161,7 @@ void GetPrepopulatedTemplateFromPrefs(Profile* profile,
|
| engine->GetString("suggest_url", &suggest_url);
|
| engine->GetString("instant_url", &instant_url);
|
| engine->GetString("image_url", &image_url);
|
| + engine->GetString("new_tab_url", &new_tab_url);
|
| engine->GetString("search_url_post_params", &search_url_post_params);
|
| engine->GetString("suggest_url_post_params", &suggest_url_post_params);
|
| engine->GetString("instant_url_post_params", &instant_url_post_params);
|
| @@ -1166,7 +1170,7 @@ void GetPrepopulatedTemplateFromPrefs(Profile* profile,
|
| engine->GetString("search_terms_replacement_key",
|
| &search_terms_replacement_key);
|
| t_urls->push_back(MakePrepopulatedTemplateURL(profile, name, keyword,
|
| - search_url, suggest_url, instant_url, image_url,
|
| + search_url, suggest_url, instant_url, image_url, new_tab_url,
|
| search_url_post_params, suggest_url_post_params,
|
| instant_url_post_params, image_url_post_params,
|
| favicon_url, encoding, *alternate_urls, search_terms_replacement_key,
|
| @@ -1188,10 +1192,11 @@ TemplateURL* MakePrepopulatedTemplateURLFromPrepopulateEngine(
|
|
|
| return MakePrepopulatedTemplateURL(profile, WideToUTF16(engine.name),
|
| WideToUTF16(engine.keyword), engine.search_url, engine.suggest_url,
|
| - engine.instant_url, engine.image_url, engine.search_url_post_params,
|
| - engine.suggest_url_post_params, engine.instant_url_post_params,
|
| - engine.image_url_post_params, engine.favicon_url, engine.encoding,
|
| - alternate_urls, engine.search_terms_replacement_key, engine.id);
|
| + engine.instant_url, engine.image_url, engine.new_tab_url,
|
| + engine.search_url_post_params, engine.suggest_url_post_params,
|
| + engine.instant_url_post_params, engine.image_url_post_params,
|
| + engine.favicon_url, engine.encoding, alternate_urls,
|
| + engine.search_terms_replacement_key, engine.id);
|
| }
|
|
|
| bool SameDomain(const GURL& given_url, const GURL& prepopulated_url) {
|
|
|