diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-13 21:24:18 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-13 21:24:18 +0000 |
| commit | 033f342bd5ae69efaa4c0bbbf446427c8ba9907e (patch) | |
| tree | 74265412601e725af9214dae9ff9107112ac27c8 /chrome/browser/ui/omnibox | |
| parent | 94f5193f68e70ac63928a6dd661ea2dad124e13a (diff) | |
| download | chromium_src-033f342bd5ae69efaa4c0bbbf446427c8ba9907e.zip chromium_src-033f342bd5ae69efaa4c0bbbf446427c8ba9907e.tar.gz chromium_src-033f342bd5ae69efaa4c0bbbf446427c8ba9907e.tar.bz2 | |
Misc. autocomplete cleanup:
* Add or rename some functions on AutocompleteMatch for getting keyword-related state. One of these in particular (GetTemplateURL()) currently has a trivial implementation, but that will change in the future.
* Change OpenMatch() to not take a final keyword argument. After some study, I don't think this argument is important. Basically, we use it to look up the appropriate TemplateURL* for the match; but the match already has a TemplateURL* as a member that we can just use directly.
* Simplify OpenMatch() a bit by making it explicitly rely on the fact that we only set TemplateURLs for "GENERATED" and "KEYWORD" transition types.
* Fix a bug (introduced by the NetworkActionPredictor code) that caused the whole autocomplete backing system to spin up immediately during startup.
* A few other odds and ends, some aiming at minimizing future diffs due to TemplateURL refactoring.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9695026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126477 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/omnibox')
| -rw-r--r-- | chrome/browser/ui/omnibox/omnibox_view.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/ui/omnibox/omnibox_view.h b/chrome/browser/ui/omnibox/omnibox_view.h index 234907f..176a9b1 100644 --- a/chrome/browser/ui/omnibox/omnibox_view.h +++ b/chrome/browser/ui/omnibox/omnibox_view.h @@ -78,14 +78,11 @@ class OmniboxView { // // |selected_line| is passed to SendOpenNotification(); see comments there. // - // If the URL was expanded from a keyword, |keyword| is that keyword. - // // This may close the popup. virtual void OpenMatch(const AutocompleteMatch& match, WindowOpenDisposition disposition, const GURL& alternate_nav_url, - size_t selected_line, - const string16& keyword) = 0; + size_t selected_line) = 0; // Returns the current text of the edit control, which could be the // "temporary" text set by the popup, the "permanent" text set by the |