summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-24 04:49:34 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-24 04:49:34 +0000
commit4ab4c7c5fd8008de223d1bb7f2361cd80bac9778 (patch)
tree54e963ae4e745d8f9370bf759d171feb99c5af97 /chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
parent4030ced8df93134f9da566dddd5fcb7e1882307f (diff)
downloadchromium_src-4ab4c7c5fd8008de223d1bb7f2361cd80bac9778.zip
chromium_src-4ab4c7c5fd8008de223d1bb7f2361cd80bac9778.tar.gz
chromium_src-4ab4c7c5fd8008de223d1bb7f2361cd80bac9778.tar.bz2
Makes committing the suggested text only update the default search
provider and nothing else. BUG=none TEST=none Review URL: http://codereview.chromium.org/5270001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67218 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_edit_view_mac.mm')
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_mac.mm12
1 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
index b91d3a5..1d98032 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
@@ -354,10 +354,6 @@ void AutocompleteEditViewMac::SetWindowTextAndCaretPos(const std::wstring& text,
SetTextAndSelectedRange(text, NSMakeRange(caret_pos, caret_pos));
}
-void AutocompleteEditViewMac::ReplaceSelection(const string16& text) {
- NOTIMPLEMENTED();
-}
-
void AutocompleteEditViewMac::SetForcedQuery() {
// We need to do this first, else |SetSelectedRange()| won't work.
FocusLocation(true);
@@ -478,10 +474,12 @@ void AutocompleteEditViewMac::SetSuggestText(const string16& suggest_text) {
}
bool AutocompleteEditViewMac::CommitSuggestText() {
- bool success = (suggest_text_length_ > 0);
+ if (suggest_text_length_ == 0)
+ return false;
+
suggest_text_length_ = 0;
- SetText(GetText());
- return success;
+ model()->FinalizeInstantQuery(GetText());
+ return true;
}
void AutocompleteEditViewMac::SetText(const std::wstring& display_text) {