Adds selection expansion support for Contextual Search.

chrome/browser/android/contextualsearch/contextual_search_delegate.h

 // Copyright 2015 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_ANDROID_CONTEXTUALSEARCH_CONTEXTUAL_SEARCH_DELEGATE_H_
 #define CHROME_BROWSER_ANDROID_CONTEXTUALSEARCH_CONTEXTUAL_SEARCH_DELEGATE_H_
 
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "base/values.h"
 #include "chrome/browser/android/contextualsearch/contextual_search_context.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
 namespace net {
 class URLRequestContextGetter;
 }  // namespace net
 
 class Profile;
 class TemplateURLService;
 
 // Handles tasks for the ContextualSearchManager in a separable and testable
 // way, without the complication of being connected to a Java object.
 class ContextualSearchDelegate
     : public net::URLFetcherDelegate,
       public base::SupportsWeakPtr<ContextualSearchDelegate> {
  public:
-  typedef base::Callback<
-      void(bool, int, const std::string&, const std::string&,
-           const std::string&, bool)>
-      SearchTermResolutionCallback;
+  typedef base::Callback<void(bool,
+                              int,
+                              const std::string&,
+                              const std::string&,
+                              const std::string&,
+                              bool,
+                              int,
+                              int)> SearchTermResolutionCallback;
   typedef base::Callback<
       void(const std::string&, const std::string&)> SurroundingTextCallback;
   typedef base::Callback<
       void(const base::string16&, int, int)>
       HandleSurroundingsCallback;
   typedef base::Callback<
       void(const std::string&, const base::string16&, size_t, size_t)>
       IcingCallback;
 
   // ID used in creating URLFetcher for Contextual Search results.
@@ skipping 35 matching lines @@
   }
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ContextualSearchDelegateTest,
                            SurroundingTextHighMaximum);
   FRIEND_TEST_ALL_PREFIXES(ContextualSearchDelegateTest,
                            SurroundingTextLowMaximum);
   FRIEND_TEST_ALL_PREFIXES(ContextualSearchDelegateTest,
                            SurroundingTextNoBeforeText);
   FRIEND_TEST_ALL_PREFIXES(ContextualSearchDelegateTest,
+                           ExtractMentionsStartEnd);
+  FRIEND_TEST_ALL_PREFIXES(ContextualSearchDelegateTest,
                            SurroundingTextForIcing);
   FRIEND_TEST_ALL_PREFIXES(ContextualSearchDelegateTest,
                            SurroundingTextForIcingNegativeLimit);
   FRIEND_TEST_ALL_PREFIXES(ContextualSearchDelegateTest,
                            DecodeSearchTermsFromJsonResponse);
 
   // net::URLFetcherDelegate:
   void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // Builds the search term resolution request URL from the current context.
@@ skipping 43 matching lines @@
   // already sending their URL browsing activity to Google.
   bool CanSendPageURL(const GURL& current_page_url,
                       Profile* profile,
                       TemplateURLService* template_url_service);
 
   // Decodes the given json response string and extracts parameters.
   void DecodeSearchTermsFromJsonResponse(const std::string& response,
                                          std::string* search_term,
                                          std::string* display_text,
                                          std::string* alternate_term,
-                                         std::string* prevent_preload);
+                                         std::string* prevent_preload,
+                                         int* mention_start,
+                                         int* mention_end);
+
+  void ExtractMentionsStartEnd(const base::ListValue& mentions_list,
+                               int* startResult,
+                               int* endResult);
 
   // Returns the surrounding size to use for the search term resolution
   // request.
   int GetSearchTermSurroundingSize();
 
   // Returns the size of the surroundings to be sent to Icing.
   int GetIcingSurroundingSize();
 
   // Generates a subset of the given surrounding_text string, for Icing
   // integration.
@@ skipping 30 matching lines @@
   // The callback for notifications of Icing selection being available.
   IcingCallback icing_callback_;
 
   // Used to hold the context until an upcoming search term request is started.
   scoped_ptr<ContextualSearchContext> context_;
 
   DISALLOW_COPY_AND_ASSIGN(ContextualSearchDelegate);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_CONTEXTUALSEARCH_CONTEXTUAL_SEARCH_DELEGATE_H_