Add search_terms_replacement_key field to TemplateURL.

chrome/browser/search_engines/template_url.h

 // 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.
 
 #ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 147 matching lines @@
   // Enumeration of the known types.
   enum ReplacementType {
     ENCODING,
     GOOGLE_ACCEPTED_SUGGESTION,
     GOOGLE_ASSISTED_QUERY_STATS,
     GOOGLE_BASE_URL,
     GOOGLE_BASE_SUGGEST_URL,
     GOOGLE_CURSOR_POSITION,
     GOOGLE_INSTANT_ENABLED,
     GOOGLE_INSTANT_EXTENDED_ENABLED,
+    GOOGLE_INSTANT_EXTENDED_ENABLED_KEY,
     GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION,
     GOOGLE_RLZ,
     GOOGLE_SEARCH_CLIENT,
     GOOGLE_SEARCH_FIELDTRIAL_GROUP,
     GOOGLE_UNESCAPED_SEARCH_TERMS,
     LANGUAGE,
     SEARCH_TERMS,
   };
 
   // Used to identify an element of the raw url that can be replaced.
@@ skipping 168 matching lines @@
   int prepopulate_id;
 
   // The primary unique identifier for Sync. This set on all TemplateURLs
   // regardless of whether they have been associated with Sync.
   std::string sync_guid;
 
   // A list of URL patterns that can be used, in addition to |url_|, to extract
   // search terms from a URL.
   std::vector<std::string> alternate_urls;
 
+

[Peter Kasting, 2012/12/18 01:54:43]

Nit: Extra newline

[beaudoin, 2012/12/20 04:23:29]

Done.

+  // A parameter that, if present and non-zero in a search_url or instant_url,
+  // causes Chrome to replace the URL with the search term.
+  // The parameter must be in the query if the search terms are in the query,
+  // and in the ref if the search terms are in the ref.
+  std::string search_terms_replacement_key;
+
  private:
   // Private so we can enforce using the setters and thus enforce that these
   // fields are never empty.
   string16 keyword_;
   std::string url_;
 };
 
 
 // TemplateURL ----------------------------------------------------------------
 
@@ skipping 31 matching lines @@
   const std::string& url() const { return data_.url(); }
   const std::string& suggestions_url() const { return data_.suggestions_url; }
   const std::string& instant_url() const { return data_.instant_url; }
   const std::vector<std::string>& alternate_urls() const {
     return data_.alternate_urls;
   }
   const GURL& favicon_url() const { return data_.favicon_url; }
 
   const GURL& originating_url() const { return data_.originating_url; }
 
+  const std::string& search_terms_replacement_key() const {
+    return data_.search_terms_replacement_key;
+  }

[Peter Kasting, 2012/12/18 01:54:43]

Nit: Keep the accessor/mutator order here the same as the member order in
TemplateURLData above.  This should probably go right after sync_guid().

[beaudoin, 2012/12/20 04:23:29]

Done.

+
   bool show_in_default_list() const { return data_.show_in_default_list; }
   // Returns true if show_in_default_list() is true and this TemplateURL has a
   // TemplateURLRef that supports replacement.
   bool ShowInDefaultList() const;
 
   bool safe_for_autoreplace() const { return data_.safe_for_autoreplace; }
 
   const std::vector<std::string>& input_encodings() const {
     return data_.input_encodings;
   }
@@ skipping 78 matching lines @@
   TemplateURLRef url_ref_;
   TemplateURLRef suggestions_url_ref_;
   TemplateURLRef instant_url_ref_;
 
   // TODO(sky): Add date last parsed OSD file.
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURL);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_