More work fixing miscellaneous issues in the autocomplete code, probably none of which will help my crasher :(

* Force the query to stop if the user deletes a match.  This makes more sense from a UI perspective and allows some code to be simpler.
* Prevent us from potentially doing a "minimal changes" match in a different profile (hard to trigger, likely no practical effects)
* Remove unneeded Reset() call on a repeating timer (which will auto-reset itself)
* Rename one of the notifications and move its listener to the edit, since that's who really cares about it anyway.
* Make the controller's Stop(true) notify the popup via the normal observer pipeline rather than coding something special into the popup's StopAutocomplete().
* Rename |paste_and_go_controller| |synchronous_controller| and use it instead of using the main popup controller to do the synchronous query when calling URLsForDefaultMatch().  This makes things both simpler and safer.

BUG=none
TEST=Using the omnibox still works fine
Review URL: http://codereview.chromium.org/178049

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25044 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 23 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_popup_model.h b/chrome/browser/autocomplete/autocomplete_popup_model.h
index c0c6185..166a238 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_model.h
+++ b/chrome/browser/autocomplete/autocomplete_popup_model.h
@@ -94,25 +94,6 @@ class AutocompletePopupModel : public NotificationObserver {
       bool* is_history_what_you_typed_match,
       GURL* alternate_nav_url) const;
 
-  // This is sort of a hybrid between StartAutocomplete() and
-  // URLForCurrentSelection().  When the popup isn't open and the user hits
-  // enter, we want to get the default match for the user's input immediately,
-  // and not open the popup, continue running autocomplete, etc.  Therefore,
-  // this does a query for only the synchronously available matches for the
-  // provided input parameters, sets |transition|,
-  // |is_history_what_you_typed_match|, and |alternate_nav_url| (if applicable)
-  // based on the default match, and returns its url. |transition|,
-  // |is_history_what_you_typed_match| and/or |alternate_nav_url| may be null,
-  // in which case they are not updated.
-  //
-  // If there are no matches for |text|, leaves the outparams unset and returns
-  // the empty string.
-  GURL URLsForDefaultMatch(const std::wstring& text,
-                           const std::wstring& desired_tld,
-                           PageTransition::Type* transition,
-                           bool* is_history_what_you_typed_match,
-                           GURL* alternate_nav_url);
-
   // Gets the selected keyword or keyword hint for the given match.  Returns
   // true if |keyword| represents a keyword hint, or false if |keyword|
   // represents a selected keyword.  (|keyword| will always be set [though
@@ -168,10 +149,6 @@ class AutocompletePopupModel : public NotificationObserver {
   // The match the user has manually chosen, if any.
   AutocompleteResult::Selection manually_selected_match_;
 
-  // A hack for URLsForDefaultMatch() that makes the code in Observe() do
-  // nothing.
-  bool inside_synchronous_query_;
-
   DISALLOW_COPY_AND_ASSIGN(AutocompletePopupModel);
 };