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

Side by Side Diff: chrome/browser/predictors/autocomplete_action_predictor.cc

Issue 10553029: Handle interface to prerenders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: some remediation, and deflaking browser tests. Created 8 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/predictors/autocomplete_action_predictor.h" 5 #include "chrome/browser/predictors/autocomplete_action_predictor.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/guid.h" 12 #include "base/guid.h"
13 #include "base/i18n/case_conversion.h" 13 #include "base/i18n/case_conversion.h"
14 #include "base/metrics/histogram.h" 14 #include "base/metrics/histogram.h"
15 #include "base/string_util.h" 15 #include "base/string_util.h"
16 #include "base/stringprintf.h" 16 #include "base/stringprintf.h"
17 #include "base/utf_string_conversions.h" 17 #include "base/utf_string_conversions.h"
18 #include "chrome/browser/autocomplete/autocomplete_log.h" 18 #include "chrome/browser/autocomplete/autocomplete_log.h"
19 #include "chrome/browser/autocomplete/autocomplete_match.h" 19 #include "chrome/browser/autocomplete/autocomplete_match.h"
20 #include "chrome/browser/autocomplete/autocomplete_result.h" 20 #include "chrome/browser/autocomplete/autocomplete_result.h"
21 #include "chrome/browser/history/history.h" 21 #include "chrome/browser/history/history.h"
22 #include "chrome/browser/history/history_notifications.h" 22 #include "chrome/browser/history/history_notifications.h"
23 #include "chrome/browser/history/history_service_factory.h" 23 #include "chrome/browser/history/history_service_factory.h"
24 #include "chrome/browser/history/in_memory_database.h" 24 #include "chrome/browser/history/in_memory_database.h"
25 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h" 25 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h"
26 #include "chrome/browser/predictors/predictor_database.h" 26 #include "chrome/browser/predictors/predictor_database.h"
27 #include "chrome/browser/predictors/predictor_database_factory.h" 27 #include "chrome/browser/predictors/predictor_database_factory.h"
28 #include "chrome/browser/prerender/prerender_field_trial.h" 28 #include "chrome/browser/prerender/prerender_field_trial.h"
29 #include "chrome/browser/prerender/prerender_handle.h"
29 #include "chrome/browser/prerender/prerender_manager.h" 30 #include "chrome/browser/prerender/prerender_manager.h"
30 #include "chrome/browser/prerender/prerender_manager_factory.h" 31 #include "chrome/browser/prerender/prerender_manager_factory.h"
31 #include "chrome/browser/profiles/profile.h" 32 #include "chrome/browser/profiles/profile.h"
32 #include "chrome/common/chrome_notification_types.h" 33 #include "chrome/common/chrome_notification_types.h"
33 #include "content/public/browser/browser_thread.h" 34 #include "content/public/browser/browser_thread.h"
34 #include "content/public/browser/notification_details.h" 35 #include "content/public/browser/notification_details.h"
35 #include "content/public/browser/notification_service.h" 36 #include "content/public/browser/notification_service.h"
36 #include "content/public/browser/notification_source.h" 37 #include "content/public/browser/notification_source.h"
37 38
38 namespace { 39 namespace {
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 i->destination_url) == match_it->urls.end()) { 147 i->destination_url) == match_it->urls.end()) {
147 match_it->urls.push_back(i->destination_url); 148 match_it->urls.push_back(i->destination_url);
148 } 149 }
149 } 150 }
150 } 151 }
151 152
152 void AutocompleteActionPredictor::ClearTransitionalMatches() { 153 void AutocompleteActionPredictor::ClearTransitionalMatches() {
153 transitional_matches_.clear(); 154 transitional_matches_.clear();
154 } 155 }
155 156
157 void AutocompleteActionPredictor::StartPrerendering(
158 const GURL& url,
159 content::SessionStorageNamespace* session_storage_namespace,
160 gfx::Size size) {
161 if (prerender::PrerenderManager* prerender_manager =
162 prerender::PrerenderManagerFactory::GetForProfile(profile_)) {
163 prerender_handle_.reset(
164 prerender_manager->AddPrerenderFromOmnibox(
165 url, session_storage_namespace, size));
166 } else {
167 prerender_handle_.reset();
mmenke 2012/07/09 18:06:57 I'd suggest doing the reset first. I believe it m
mmenke 2012/07/10 18:01:13 Forgot that we always delay deletion, so it probab
gavinp 2012/07/11 17:04:00 Done. It will definitely affect the final status.
gavinp 2012/07/11 17:04:00 I think it does matter, since we'll be calling OnC
168 }
169 }
170
156 // Given a match, return a recommended action. 171 // Given a match, return a recommended action.
157 AutocompleteActionPredictor::Action 172 AutocompleteActionPredictor::Action
158 AutocompleteActionPredictor::RecommendAction( 173 AutocompleteActionPredictor::RecommendAction(
159 const string16& user_text, 174 const string16& user_text,
160 const AutocompleteMatch& match) const { 175 const AutocompleteMatch& match) const {
161 bool is_in_db = false; 176 bool is_in_db = false;
162 const double confidence = CalculateConfidence(user_text, match, &is_in_db); 177 const double confidence = CalculateConfidence(user_text, match, &is_in_db);
163 DCHECK(confidence >= 0.0 && confidence <= 1.0); 178 DCHECK(confidence >= 0.0 && confidence <= 1.0);
164 179
165 UMA_HISTOGRAM_BOOLEAN("AutocompleteActionPredictor.MatchIsInDb", is_in_db); 180 UMA_HISTOGRAM_BOOLEAN("AutocompleteActionPredictor.MatchIsInDb", is_in_db);
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 return number_of_hits / (number_of_hits + value.number_of_misses); 565 return number_of_hits / (number_of_hits + value.number_of_misses);
551 } 566 }
552 567
553 AutocompleteActionPredictor::TransitionalMatch::TransitionalMatch() { 568 AutocompleteActionPredictor::TransitionalMatch::TransitionalMatch() {
554 } 569 }
555 570
556 AutocompleteActionPredictor::TransitionalMatch::~TransitionalMatch() { 571 AutocompleteActionPredictor::TransitionalMatch::~TransitionalMatch() {
557 } 572 }
558 573
559 } // namespace predictors 574 } // namespace predictors
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698