diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-19 15:44:32 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-19 15:44:32 +0000 |
| commit | 9f07c9b7b32e68112ddca7968230e08293c2809c (patch) | |
| tree | a64f95ff80431c05de959f93e4f46738dded21d4 /chrome/browser/autocomplete/autocomplete_edit.cc | |
| parent | f334f8d30107123ed660c88d9271ed1404b96785 (diff) | |
| download | chromium_src-9f07c9b7b32e68112ddca7968230e08293c2809c.zip chromium_src-9f07c9b7b32e68112ddca7968230e08293c2809c.tar.gz chromium_src-9f07c9b7b32e68112ddca7968230e08293c2809c.tar.bz2 | |
Revert 97446 - Modifying prefetch to account for multi-profile.
Items of note:
- predictor_api is gone. Most functions in predictor_api.cc have moved into the chrome_browser_net::Predictor class or the Profile class.
- The predictor state is cleaned up in the Profile dtor.
- Predictor is owned by the ProfileIOData of the profile.
- InitialObserver class is gone since each profile keeps their own info, the non-OTR don't care if anyone is OTR.
- Predictor is created by the profile and then passed to the ProfileIOData. Then its initialization is finished on the IOThread.
- ConnectInterceptor now subclasses off of UrlRequestJobFactory::Interceptor.
- Updated Profile to create a SimpleShutdownPredictor with limited functionality when in unittests.
BUG=89937
TEST=passes existing
Review URL: http://codereview.chromium.org/7467012
TBR=rlp@chromium.org
Review URL: http://codereview.chromium.org/7690006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97465 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_edit.cc')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc index 98da003..5cea1c0 100644 --- a/chrome/browser/autocomplete/autocomplete_edit.cc +++ b/chrome/browser/autocomplete/autocomplete_edit.cc @@ -22,7 +22,7 @@ #include "chrome/browser/extensions/extension_omnibox_api.h" #include "chrome/browser/google/google_url_tracker.h" #include "chrome/browser/instant/instant_controller.h" -#include "chrome/browser/net/predictor.h" +#include "chrome/browser/net/predictor_api.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/profiles/profile.h" @@ -1083,11 +1083,8 @@ void AutocompleteEditModel::DoPrerender(const AutocompleteMatch& match) { void AutocompleteEditModel::DoPreconnect(const AutocompleteMatch& match) { if (!match.destination_url.SchemeIs(chrome::kExtensionScheme)) { // Warm up DNS Prefetch cache, or preconnect to a search service. - if (profile_->GetNetworkPredictor()) { - profile_->GetNetworkPredictor()->AnticipateOmniboxUrl( - match.destination_url, - IsPreconnectable(match.type)); - } + chrome_browser_net::AnticipateOmniboxUrl(match.destination_url, + IsPreconnectable(match.type)); // We could prefetch the alternate nav URL, if any, but because there // can be many of these as a user types an initial series of characters, // the OS DNS cache could suffer eviction problems for minimal gain. |