diff options
| author | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-31 20:15:07 +0000 |
|---|---|---|
| committer | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-31 20:15:07 +0000 |
| commit | 8ebde6bb112957ea0ff13b9b2297967bacf0acb3 (patch) | |
| tree | b972b0cbb478b4b842612552ed9de20527f4d7d7 /chrome/browser/autocomplete/autocomplete_edit.cc | |
| parent | 543e04930a52a85f683aca29417c832934036867 (diff) | |
| download | chromium_src-8ebde6bb112957ea0ff13b9b2297967bacf0acb3.zip chromium_src-8ebde6bb112957ea0ff13b9b2297967bacf0acb3.tar.gz chromium_src-8ebde6bb112957ea0ff13b9b2297967bacf0acb3.tar.bz2 | |
Revert r24920 due to compile failures.
TBR=pkasting
Review URL: http://codereview.chromium.org/181023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24927 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_edit.cc')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc index 74d3d7d..1b1cc7f 100644 --- a/chrome/browser/autocomplete/autocomplete_edit.cc +++ b/chrome/browser/autocomplete/autocomplete_edit.cc @@ -6,7 +6,6 @@ #include "base/basictypes.h" #include "base/string_util.h" -#include "base/time.h" // TEMPORARY #include "chrome/browser/autocomplete/autocomplete_edit_view.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/autocomplete/keyword_provider.h" @@ -54,9 +53,6 @@ AutocompleteEditModel::AutocompleteEditModel( // we'll set this before each call to the controller. paste_and_go_controller = new AutocompleteController(NULL); } - - temporary_timer_.Start(base::TimeDelta::FromMilliseconds(10), this, - &AutocompleteEditModel::TemporaryTimerFired); } AutocompleteEditModel::~AutocompleteEditModel() { @@ -388,7 +384,7 @@ void AutocompleteEditModel::OnUpOrDownKeyPressed(int count) { // NOTE: This purposefully don't trigger any code that resets paste_state_. if (!popup_->IsOpen()) { - if (!query_in_progress()) { + if (popup_->autocomplete_controller()->done()) { // The popup is neither open nor working on a query already. So, start an // autocomplete query for the current text. This also sets // user_input_in_progress_ to true, which we want: if the user has started @@ -555,7 +551,7 @@ GURL AutocompleteEditModel::GetURLForCurrentText( PageTransition::Type* transition, bool* is_history_what_you_typed_match, GURL* alternate_nav_url) { - return (popup_->IsOpen() || query_in_progress()) ? + return (popup_->IsOpen() || !popup_->autocomplete_controller()->done()) ? popup_->URLsForCurrentSelection(transition, is_history_what_you_typed_match, alternate_nav_url) : |