InstantExtended: Add new_tab_url to TemplateURL.

chrome/browser/search_engines/template_url.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.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/format_macros.h"
 #include "base/guid.h"
@@ skipping 220 matching lines @@
 
 TemplateURLRef::~TemplateURLRef() {
 }
 
 std::string TemplateURLRef::GetURL() const {
   switch (type_) {
     case SEARCH:  return owner_->url();
     case SUGGEST: return owner_->suggestions_url();
     case INSTANT: return owner_->instant_url();
     case IMAGE:   return owner_->image_url();
+    case NEW_TAB: return owner_->new_tab_url();
     case INDEXED: return owner_->GetURL(index_in_owner_);
     default:      NOTREACHED(); return std::string();  // NOLINT
   }
 }
 
 std::string TemplateURLRef::GetPostParamsString() const {
   switch (type_) {
     case INDEXED:
     case SEARCH:  return owner_->search_url_post_params();
     case SUGGEST: return owner_->suggestions_url_post_params();
     case INSTANT: return owner_->instant_url_post_params();
+    case NEW_TAB: return std::string();
     case IMAGE:   return owner_->image_url_post_params();
     default:      NOTREACHED(); return std::string();  // NOLINT
   }
 }
 
 bool TemplateURLRef::UsesPOSTMethodUsingTermsData(
     const SearchTermsData* search_terms_data) const {
   if (search_terms_data)
     ParseIfNecessaryUsingTermsData(*search_terms_data);
   else
@@ skipping 740 matching lines @@
 // TemplateURL ----------------------------------------------------------------
 
 TemplateURL::TemplateURL(Profile* profile, const TemplateURLData& data)
     : profile_(profile),
       data_(data),
       url_ref_(this, TemplateURLRef::SEARCH),
       suggestions_url_ref_(this,
                            TemplateURLRef::SUGGEST),
       instant_url_ref_(this,
                        TemplateURLRef::INSTANT),
-      image_url_ref_(this, TemplateURLRef::IMAGE) {
+      image_url_ref_(this, TemplateURLRef::IMAGE),
+      new_tab_url_ref_(this, TemplateURLRef::NEW_TAB) {
   SetPrepopulateId(data_.prepopulate_id);
 
   if (data_.search_terms_replacement_key ==
       kGoogleInstantExtendedEnabledKeyFull) {
     data_.search_terms_replacement_key = google_util::kInstantExtendedAPIParam;
   }
 }
 
 TemplateURL::~TemplateURL() {
 }
@@ skipping 229 matching lines @@
       // patterns. This means that given patterns
       //    [ "http://foo/#q={searchTerms}", "http://foo/?q={searchTerms}" ],
       // calling ExtractSearchTermsFromURL() on "http://foo/?q=bar#q=' would
       // return false. This is important for at least Google, where such URLs
       // are invalid.
       return !search_terms->empty();
     }
   }
   return false;
 }