Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(355)

Unified Diff: chrome/browser/android/omnibox/omnibox_prerender.cc

Issue 2652763013: Cleanup: Remove the last traces of Instant Search on Android (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/android/toolbar/toolbar_model_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/omnibox/omnibox_prerender.cc
diff --git a/chrome/browser/android/omnibox/omnibox_prerender.cc b/chrome/browser/android/omnibox/omnibox_prerender.cc
index 2d4bd402df3fb7f462937fe33c6ad530631afee5..53428803cecf706dd5a906f33c5883d496ab369f 100644
--- a/chrome/browser/android/omnibox/omnibox_prerender.cc
+++ b/chrome/browser/android/omnibox/omnibox_prerender.cc
@@ -11,7 +11,6 @@
#include "chrome/browser/predictors/autocomplete_action_predictor_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_android.h"
-#include "chrome/browser/ui/search/instant_search_prerenderer.h"
#include "components/omnibox/browser/autocomplete_match.h"
#include "components/omnibox/browser/autocomplete_result.h"
#include "content/public/browser/web_contents.h"
@@ -91,26 +90,15 @@ void OmniboxPrerender::PrerenderMaybe(
if (default_match == autocomplete_result->end())
return;
- AutocompleteActionPredictor::Action recommended_action =
- AutocompleteActionPredictor::ACTION_NONE;
- InstantSearchPrerenderer* prerenderer =
- InstantSearchPrerenderer::GetForProfile(profile);
- if (prerenderer &&
- prerenderer->IsAllowed(*default_match, web_contents)) {
- recommended_action = AutocompleteActionPredictor::ACTION_PRERENDER;
- } else {
- AutocompleteActionPredictor* action_predictor =
- AutocompleteActionPredictorFactory::GetForProfile(profile);
- if (!action_predictor)
- return;
+ AutocompleteActionPredictor* action_predictor =
+ AutocompleteActionPredictorFactory::GetForProfile(profile);
+ if (!action_predictor)
+ return;
- if (action_predictor) {
- action_predictor->
- RegisterTransitionalMatches(url_string, *autocomplete_result);
- recommended_action =
- action_predictor->RecommendAction(url_string, *default_match);
- }
- }
+ action_predictor->
+ RegisterTransitionalMatches(url_string, *autocomplete_result);
+ AutocompleteActionPredictor::Action recommended_action =
+ action_predictor->RecommendAction(url_string, *default_match);
GURL current_url = GURL(current_url_string);
switch (recommended_action) {
@@ -145,14 +133,6 @@ void OmniboxPrerender::DoPrerender(const AutocompleteMatch& match,
if (!web_contents)
return;
gfx::Rect container_bounds = web_contents->GetContainerBounds();
- InstantSearchPrerenderer* prerenderer =
- InstantSearchPrerenderer::GetForProfile(profile);
- if (prerenderer && prerenderer->IsAllowed(match, web_contents)) {
- prerenderer->Init(
- web_contents->GetController().GetDefaultSessionStorageNamespace(),
- container_bounds.size());
- return;
- }
predictors::AutocompleteActionPredictorFactory::GetForProfile(profile)->
StartPrerendering(
match.destination_url,
« no previous file with comments | « no previous file | chrome/browser/ui/android/toolbar/toolbar_model_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698