Update the contextual search API to include a parameter specifying whether the server shoudl return…

components/search_engines/template_url.h

 // Copyright 2014 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 COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_H_
 #define COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 63 matching lines @@
 
     struct ContextualSearchParams {
       ContextualSearchParams();
       ContextualSearchParams(const int version,
                              const size_t start,
                              const size_t end,
                              const std::string& selection,
                              const std::string& content,
                              const std::string& base_page_url,
                              const std::string& encoding);
+      ContextualSearchParams(const int version,

[Peter Kasting, 2014/07/31 05:14:03]

Don't add this in addition to the other constructor.  Replace the other
constructor with this version and update all callsites.

[jeremycho, 2014/07/31 20:29:08]

The existing constructor gets called by Clank so it can't be replaced in this
commit.  Once this commit is propagated and the Clank code is updated, I'll
delete it.

[Peter Kasting, 2014/07/31 20:33:49]

OK.  Consider a TODO about that if it will take more than a day or two.

[jeremycho, 2014/07/31 21:08:39]

Done.

+                             const size_t start,
+                             const size_t end,
+                             const std::string& selection,
+                             const std::string& content,
+                             const std::string& base_page_url,
+                             const std::string& encoding,
+                             const bool resolve);
       ~ContextualSearchParams();
 
       // The version of contextual search.
       int version;
 
       // Offset into the page content of the start of the user selection.
       size_t start;
 
       // Offset into the page content of the end of the user selection.
       size_t end;
 
       // The user selection.
       std::string selection;
 
       // The text including and surrounding the user selection.
       std::string content;
 
       // The URL of the page containing the user selection.
       std::string base_page_url;
 
       // The encoding of content.
       std::string encoding;
+
+      // Whether to return a resolved search term.

[Peter Kasting, 2014/07/31 05:14:03]

What does "return a resolved search term" mean?  There's not enough context for
me to understand the phrase.

[jeremycho, 2014/07/31 20:29:08]

Clarified.

+      bool resolve;
     };
 
     // The search terms (query).
     base::string16 search_terms;
 
     // The original (input) query.
     base::string16 original_query;
 
     // The type the original input query was identified as.
     metrics::OmniboxInputType::Type input_type;
@@ skipping 588 matching lines @@
   TemplateURLRef new_tab_url_ref_;
   TemplateURLRef contextual_search_url_ref_;
   scoped_ptr<AssociatedExtensionInfo> extension_info_;
 
   // TODO(sky): Add date last parsed OSD file.
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURL);
 };
 
 #endif  // COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_H_