summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
diff options
context:
space:
mode:
authorsuzhe@google.com <suzhe@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-01 17:35:24 +0000
committersuzhe@google.com <suzhe@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-01 17:35:24 +0000
commitcf6897d6732ae8ff8dc8a4519fd2753f578f8380 (patch)
treeeb3895120494141fc4af03df025800ec9ecce2c6 /chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
parent69329ab4e9bd582d3cdfde3a40d04a620a948a35 (diff)
downloadchromium_src-cf6897d6732ae8ff8dc8a4519fd2753f578f8380.zip
chromium_src-cf6897d6732ae8ff8dc8a4519fd2753f578f8380.tar.gz
chromium_src-cf6897d6732ae8ff8dc8a4519fd2753f578f8380.tar.bz2
Trigger keyword mode when pressing space in middle of string
This CL uses the allow_exact_keyword_match property of AutcompleteInput class to support this inserting space in the middle case. The logic of triggering a keyword by pressing space key at the end is not changed. BUG=77211 TEST=See bug report. Review URL: http://codereview.chromium.org/6770020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80177 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.mm8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
index e86823e..cd3d612 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -673,10 +673,10 @@ bool AutocompleteEditViewMac::OnAfterPossibleChange() {
delete_at_end_pressed_ = false;
- const bool allow_keyword_ui_change = at_end_of_edit && !IsImeComposing();
- const bool something_changed = model_->OnAfterPossibleChange(new_text,
+ const bool something_changed = model_->OnAfterPossibleChange(
+ new_text, new_selection.location, NSMaxRange(new_selection),
selection_differs, text_differs, just_deleted_text,
- allow_keyword_ui_change);
+ !IsImeComposing());
if (delete_was_pressed_ && at_end_of_edit)
delete_at_end_pressed_ = true;