Upstream version 5.34.104.0

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

diff --git a/src/chrome/browser/ui/browser_instant_controller.cc b/src/chrome/browser/ui/browser_instant_controller.cc
index 6cbab72..7bac258 100644 (file)
--- a/src/chrome/browser/ui/browser_instant_controller.cc
+++ b/src/chrome/browser/ui/browser_instant_controller.cc
@@ -73,10 +73,8 @@ bool BrowserInstantController::OpenInstant(WindowOpenDisposition disposition,
   // support for the new disposition.
   DCHECK(disposition == CURRENT_TAB) << disposition;
 
-  // If we will not be replacing search terms from this URL, don't send to
-  // InstantController.
   const base::string16& search_terms =
-      chrome::GetSearchTermsFromURL(browser_->profile(), url);
+      chrome::ExtractSearchTermsFromURL(profile(), url);
   if (search_terms.empty())
     return false;
 
@@ -93,6 +91,11 @@ bool BrowserInstantController::OpenInstant(WindowOpenDisposition disposition,
     }
   }
 
+  // If we will not be replacing search terms from this URL, don't send to
+  // InstantController.
+  if (!chrome::IsQueryExtractionAllowedForURL(profile(), url))
+    return false;
+
   return instant_.SubmitQuery(search_terms);
 }
 
@@ -117,10 +120,6 @@ void BrowserInstantController::TabDeactivated(content::WebContents* contents) {
     prerenderer->Cancel();
 }
 
-void BrowserInstantController::SetOmniboxBounds(const gfx::Rect& bounds) {
-  instant_.SetOmniboxBounds(bounds);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserInstantController, SearchModelObserver implementation: