diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 14:51:55 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 14:51:55 +0000 |
| commit | 33b8b8e68843131c6f81c47a0d0c0c616a01b355 (patch) | |
| tree | 37a3722b10fa9cfdaa5cb24eaa124f1943446fbf /chrome/browser/ui/cocoa | |
| parent | 5976255eccb8c585c4e5ed0fefe4144d62bd1f74 (diff) | |
| download | chromium_src-33b8b8e68843131c6f81c47a0d0c0c616a01b355.zip chromium_src-33b8b8e68843131c6f81c47a0d0c0c616a01b355.tar.gz chromium_src-33b8b8e68843131c6f81c47a0d0c0c616a01b355.tar.bz2 | |
Wires up ability for page to specify instant auto complete
behavior. The choices are:
. immediately (current behavior and is the default).
. delayed (transitions to autocompleted after a delay).
. never (only show the suggestion, but never autocomplete it).
I'm doing this so we can collect some data to help understand which is
the less error prone of the 3. The data collection is all done on the
server side.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6685002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78211 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa')
| -rw-r--r-- | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h | 3 | ||||
| -rw-r--r-- | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h index aa56b6c..14cf022 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h @@ -54,7 +54,8 @@ class LocationBarViewMac : public AutocompleteEditController, // Overridden from LocationBar: virtual void ShowFirstRunBubble(FirstRun::BubbleType bubble_type); - virtual void SetSuggestedText(const string16& text); + virtual void SetSuggestedText(const string16& text, + InstantCompleteBehavior behavior); virtual std::wstring GetInputString() const; virtual WindowOpenDisposition GetWindowOpenDisposition() const; virtual PageTransition::Type GetPageTransition() const; diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm index 61b12fd..2c246a6 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm @@ -137,8 +137,9 @@ std::wstring LocationBarViewMac::GetInputString() const { return location_input_; } -void LocationBarViewMac::SetSuggestedText(const string16& text) { - edit_view_->model()->SetSuggestedText(text); +void LocationBarViewMac::SetSuggestedText(const string16& text, + InstantCompleteBehavior behavior) { + edit_view_->model()->SetSuggestedText(text, behavior); } WindowOpenDisposition LocationBarViewMac::GetWindowOpenDisposition() const { |