InstantExtended: Add new_tab_url to TemplateURL.

chrome/browser/search_engines/template_url_prepopulate_data.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <locale.h>
 #endif
 
@@ skipping 1059 matching lines @@
 }
 
 TemplateURL* MakePrepopulatedTemplateURL(
     Profile* profile,
     const string16& name,
     const string16& keyword,
     const base::StringPiece& search_url,
     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,
     const base::StringPiece& image_url_post_params,
     const base::StringPiece& favicon_url,
     const base::StringPiece& encoding,
     const ListValue& alternate_urls,
     const base::StringPiece& search_terms_replacement_key,
     int id) {
 
   TemplateURLData data;
 
   data.short_name = name;
   data.SetKeyword(keyword);
   data.SetURL(search_url.as_string());
   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();
   data.image_url_post_params = image_url_post_params.as_string();
   data.favicon_url = GURL(favicon_url.as_string());
   data.show_in_default_list = true;
   data.safe_for_autoreplace = true;
   data.input_encodings.push_back(encoding.as_string());
   data.date_created = base::Time();
   data.last_modified = base::Time();
@@ skipping 33 matching lines @@
         engine->GetString("keyword", &keyword) && !keyword.empty() &&
         engine->GetString("search_url", &search_url) && !search_url.empty() &&
         engine->GetString("favicon_url", &favicon_url) &&
         !favicon_url.empty() &&
         engine->GetString("encoding", &encoding) && !encoding.empty() &&
         engine->GetInteger("id", &id)) {
       // These fields are optional.
       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;
       std::string image_url_post_params;
       ListValue empty_list;
       const ListValue* alternate_urls = &empty_list;
       std::string search_terms_replacement_key;
       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);
       engine->GetString("image_url_post_params", &image_url_post_params);
       engine->GetList("alternate_urls", &alternate_urls);
       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,
           id));
     }
   }
 }
 
 // The caller owns the returned TemplateURL.
 TemplateURL* MakePrepopulatedTemplateURLFromPrepopulateEngine(
     Profile* profile,
     const PrepopulatedEngine& engine) {
 
   ListValue alternate_urls;
   if (engine.alternate_urls) {
     for (size_t i = 0; i < engine.alternate_urls_size; ++i)
       alternate_urls.AppendString(std::string(engine.alternate_urls[i]));
   }
 
   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) {
   return prepopulated_url.is_valid() &&
       net::registry_controlled_domains::SameDomainOrHost(
           given_url, prepopulated_url,
           net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
 }
 
 }  // namespace
@@ skipping 123 matching lines @@
 }
 
 GURL GetLogoURL(const TemplateURL& template_url, LogoSize size) {
   if (GetEngineType(template_url) != SEARCH_ENGINE_GOOGLE)
     return GURL();
   return GURL((size == LOGO_200_PERCENT) ?
       google_logos.logo_200_percent_url : google_logos.logo_100_percent_url);
 }
 
 }  // namespace TemplateURLPrepopulateData