Add contextual search to the template url system

chrome/browser/search_engines/template_url.cc

Index: chrome/browser/search_engines/template_url.cc
diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc
index e3eac0bc5da032b6ca5b2a4062204a4e0fef5bc5..aae466372d9f73d105ff1bcd23d18b2d61f8eb9b 100644
--- a/chrome/browser/search_engines/template_url.cc
+++ b/chrome/browser/search_engines/template_url.cc
@@ -102,6 +102,11 @@ const char kGoogleImageURLParameter[] = "google:imageURL";
 const char kGoogleImageOriginalWidth[] = "google:imageOriginalWidth";
 const char kGoogleImageOriginalHeight[] = "google:imageOriginalHeight";
 
+// Contextual search parameters.

[Peter Kasting, 2014/06/06 17:51:33]

Nit: It seems like these and the image search constants just above should be
rolled into the larger alphabetized list above them.

[jeremycho, 2014/06/06 21:51:45]

Done.

+const char kGoogleContextualSearchVersion[] = "google:contextualSearchVersion";
+const char kGoogleContextualSearchContextData[] =
+    "google:contextualSearchContextData";
+
 // Display value for kSearchTermsParameter.
 const char kDisplaySearchTerms[] = "%s";
 
@@ -208,12 +213,19 @@ TemplateURLRef::SearchTermsArgs::SearchTermsArgs(
       bookmark_bar_pinned(false),
       append_extra_query_params(false),
       force_instant_results(false),
-      from_app_list(false) {
+      from_app_list(false),
+      contextual_search_params(ContextualSearchParams()) {
 }
 
 TemplateURLRef::SearchTermsArgs::~SearchTermsArgs() {
 }
 
+TemplateURLRef::SearchTermsArgs::ContextualSearchParams::
+    ContextualSearchParams()
+    : version(-1),
+      start(base::string16::npos),
+      end(base::string16::npos) {
+}
 
 // TemplateURLRef -------------------------------------------------------------
 
@@ -250,24 +262,26 @@ 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
+    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 CONTEXTUAL_SEARCH: return owner_->contextual_search_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();
+    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 CONTEXTUAL_SEARCH: return std::string();
+    case IMAGE:             return owner_->image_url_post_params();
     default:      NOTREACHED(); return std::string();  // NOLINT
   }
 }
@@ -591,6 +605,12 @@ bool TemplateURLRef::ParseParameter(size_t start,
     replacements->push_back(Replacement(GOOGLE_NTP_IS_THEMED, start));
   } else if (parameter == kGoogleOmniboxStartMarginParameter) {
     replacements->push_back(Replacement(GOOGLE_OMNIBOX_START_MARGIN, start));
+  } else if (parameter == kGoogleContextualSearchVersion) {
+    replacements->push_back(
+        Replacement(GOOGLE_CONTEXTUAL_SEARCH_VERSION, start));
+  } else if (parameter == kGoogleContextualSearchContextData) {
+    replacements->push_back(
+        Replacement(GOOGLE_CONTEXTUAL_SEARCH_CONTEXT_DATA, start));
   } else if (parameter == kGoogleOriginalQueryForSuggestionParameter) {
     replacements->push_back(Replacement(GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION,
                                         start));
@@ -927,6 +947,58 @@ std::string TemplateURLRef::HandleReplacements(
         }
         break;
 
+      case GOOGLE_CONTEXTUAL_SEARCH_VERSION:
+        if (search_terms_args.contextual_search_params.version >= 0) {
+          HandleReplacement(
+              "ctxs",
+              base::IntToString(
+                  search_terms_args.contextual_search_params.version),
+              *i,
+              &url);
+        }
+        break;
+
+      case GOOGLE_CONTEXTUAL_SEARCH_CONTEXT_DATA: {
+        DCHECK(!i->is_post_param);
+        std::string context_data;
+
+        if (search_terms_args.contextual_search_params.start !=

[Peter Kasting, 2014/06/06 17:51:33]

Nit: If above all these you do something like this:

  const ContextualSearchParams& params =
      search_terms_args.contextual_search_params;

Then you can use "params.<member>" everywhere below, reducing wordiness and
allowing you to eliminate the "const std::string" temps that you create just to
shorten the names.

[jeremycho, 2014/06/06 21:51:45]

Done.

+            std::string::npos) {
+          context_data.append("ctxs_start=" + base::IntToString(
+              search_terms_args.contextual_search_params.start) + "&");
+        }
+
+        if (search_terms_args.contextual_search_params.end !=
+            std::string::npos) {
+          context_data.append("ctxs_end=" + base::IntToString(
+              search_terms_args.contextual_search_params.end) + "&");
+        }
+
+        const std::string selection =
+            search_terms_args.contextual_search_params.selection;
+        if (!selection.empty())
+          context_data.append("q=" + selection + "&");
+
+        const std::string content =
+            search_terms_args.contextual_search_params.content;
+        if (!content.empty())
+          context_data.append("ctxs_content=" + content + "&");
+
+        const std::string base_page_url =
+            search_terms_args.contextual_search_params.base_page_url;
+        if (!base_page_url.empty())
+          context_data.append("ctxs_url=" + base_page_url + "&");
+
+        const std::string encoding =
+            search_terms_args.contextual_search_params.encoding;
+        if (!encoding.empty()) {
+          context_data.append("ctxs_encoding=" + encoding + "&");
+        }
+
+        HandleReplacement(std::string(), context_data, *i, &url);
+        break;
+      }
+
       case GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION:
         DCHECK(!i->is_post_param);
         if (search_terms_args.accepted_suggestion >= 0 ||
@@ -1098,7 +1170,8 @@ TemplateURL::TemplateURL(Profile* profile, const TemplateURLData& data)
       instant_url_ref_(this,
                        TemplateURLRef::INSTANT),
       image_url_ref_(this, TemplateURLRef::IMAGE),
-      new_tab_url_ref_(this, TemplateURLRef::NEW_TAB) {
+      new_tab_url_ref_(this, TemplateURLRef::NEW_TAB),
+      contextual_search_url_ref_(this, TemplateURLRef::CONTEXTUAL_SEARCH) {
   SetPrepopulateId(data_.prepopulate_id);
 
   if (data_.search_terms_replacement_key ==