Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / search / instant_search_prerenderer.cc

diff --git a/src/chrome/browser/ui/search/instant_search_prerenderer.cc b/src/chrome/browser/ui/search/instant_search_prerenderer.cc
index 4431a30..94b94de 100644 (file)
--- a/src/chrome/browser/ui/search/instant_search_prerenderer.cc
+++ b/src/chrome/browser/ui/search/instant_search_prerenderer.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/search/instant_search_prerenderer.h"
 
-#include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/prerender/prerender_handle.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
@@ -14,6 +13,7 @@
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
+#include "components/omnibox/autocomplete_match.h"
 
 namespace {
 
@@ -100,10 +100,12 @@ void InstantSearchPrerenderer::Prerender(const InstantSuggestion& suggestion) {
       SetSuggestionToPrefetch(suggestion);
 }
 
-void InstantSearchPrerenderer::Commit(const base::string16& query) {
+void InstantSearchPrerenderer::Commit(
+    const base::string16& query,
+    const EmbeddedSearchRequestParams& params) {
   DCHECK(prerender_handle_);
   DCHECK(prerender_contents());
-  SearchTabHelper::FromWebContents(prerender_contents())->Submit(query);
+  SearchTabHelper::FromWebContents(prerender_contents())->Submit(query, params);
 }
 
 bool InstantSearchPrerenderer::CanCommitQuery(
@@ -129,7 +131,8 @@ bool InstantSearchPrerenderer::UsePrerenderedPage(
       prerender::PrerenderManagerFactory::GetForProfile(profile_);
   if (search_terms.empty() || !params->target_contents ||
       !prerender_contents() || !prerender_manager ||
-      !QueryMatchesPrefetch(search_terms)) {
+      !QueryMatchesPrefetch(search_terms) ||
+      params->disposition != CURRENT_TAB) {
     Cancel();
     return false;
   }