diff options
| author | dominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 15:52:22 +0000 |
|---|---|---|
| committer | dominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 15:52:22 +0000 |
| commit | 01747e4d5b3ddf8f033536e1cd3c9048bd72a574 (patch) | |
| tree | 9235db04276eaaf964f4feb5d0872e84d667882b /chrome/browser/autocomplete | |
| parent | 7713c39fa1e8b7ea064739f19f9d107d33b1160a (diff) | |
| download | chromium_src-01747e4d5b3ddf8f033536e1cd3c9048bd72a574.zip chromium_src-01747e4d5b3ddf8f033536e1cd3c9048bd72a574.tar.gz chromium_src-01747e4d5b3ddf8f033536e1cd3c9048bd72a574.tar.bz2 | |
Add Field Trial for Prerender From Omnibox.
BUG=95066
TEST=None
Review URL: http://codereview.chromium.org/7825009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101963 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc index 8c4958e..9777b41 100644 --- a/chrome/browser/autocomplete/autocomplete_edit.cc +++ b/chrome/browser/autocomplete/autocomplete_edit.cc @@ -7,7 +7,6 @@ #include <string> #include "base/basictypes.h" -#include "base/command_line.h" #include "base/metrics/histogram.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -24,6 +23,7 @@ #include "chrome/browser/instant/instant_controller.h" #include "chrome/browser/net/predictor.h" #include "chrome/browser/net/url_fixer_upper.h" +#include "chrome/browser/prerender/prerender_field_trial.h" #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" @@ -208,6 +208,7 @@ bool AutocompleteEditModel::AcceptCurrentInstantPreview() { void AutocompleteEditModel::OnChanged() { const AutocompleteMatch current_match = CurrentMatch(); + string16 suggested_text; // Confer with the NetworkActionPredictor to determine what action, if any, @@ -220,10 +221,8 @@ void AutocompleteEditModel::OnChanged() { bool might_support_instant = false; if (!DoInstant(current_match, &suggested_text, &might_support_instant)) { // Ignore the recommended action if Omnibox prerendering is not enabled. - if (!CommandLine::ForCurrentProcess()->HasSwitch( - switches::kPrerenderFromOmnibox)) { + if (!prerender::IsOmniboxEnabled(profile_)) recommended_action = NetworkActionPredictor::ACTION_NONE; - } switch (recommended_action) { case NetworkActionPredictor::ACTION_PRERENDER: @@ -835,10 +834,8 @@ void AutocompleteEditModel::OnResultChanged(bool default_match_changed) { match->fill_into_edit.substr(match->inline_autocomplete_offset); } - if (!CommandLine::ForCurrentProcess()->HasSwitch( - switches::kPrerenderFromOmnibox)) { + if (!prerender::IsOmniboxEnabled(profile_)) DoPreconnect(*match); - } // 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, |