diff options
| author | dominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-08 03:19:33 +0000 |
|---|---|---|
| committer | dominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-08 03:19:33 +0000 |
| commit | 65d68da4806e736a53cf263cbeba8fcae6c06b87 (patch) | |
| tree | 0d2ef27d05e305ed7fb8ba95d9695cfc27c2e7fd /chrome/browser/autocomplete/autocomplete_edit.h | |
| parent | d25dd3cbcb3002055eeb48ae2e198cb1a83a37d2 (diff) | |
| download | chromium_src-65d68da4806e736a53cf263cbeba8fcae6c06b87.zip chromium_src-65d68da4806e736a53cf263cbeba8fcae6c06b87.tar.gz chromium_src-65d68da4806e736a53cf263cbeba8fcae6c06b87.tar.bz2 | |
Fix prerender-from-omnibox/Instant issues.
When we attempt to show an Instant preview tab we return a boolean to indicate success. We then only try to prerender if this returns false and if the prerender-from-omnibox flag is set.
BUG=94423
TEST=Manual: Tested combinations of no flags, --prerender-from-omnibox, and --restrict-instant-to-search.
Review URL: http://codereview.chromium.org/7828057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100091 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_edit.h')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit.h b/chrome/browser/autocomplete/autocomplete_edit.h index ff92b70..b31b2a6 100644 --- a/chrome/browser/autocomplete/autocomplete_edit.h +++ b/chrome/browser/autocomplete/autocomplete_edit.h @@ -423,8 +423,11 @@ class AutocompleteEditModel : public AutocompleteControllerDelegate { size_t caret_position); // Tries to start an instant preview for |match|. Returns true if instant is - // supported. |suggested_text| must be non-NULL. - bool DoInstant(const AutocompleteMatch& match, string16* suggested_text); + // showing and sets |might_support_instant| to true if instant is supported. + // |suggested_text| and |might_support_instant| must be non-NULL. + bool DoInstant(const AutocompleteMatch& match, + string16* suggested_text, + bool* might_support_instant); // Starts a prerender for the given |match|. void DoPrerender(const AutocompleteMatch& match); |