summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorhbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-04 11:18:29 +0000
committerhbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-04 11:18:29 +0000
commit434e72675f5b2ef5800a3619e9f3e6c5475f702b (patch)
tree2281c7cec3a6667de3c11ece3256215bd868dffb /chrome
parentec2bc65f627293863a35ce2cf4f4c34f981dbe5d (diff)
downloadchromium_src-434e72675f5b2ef5800a3619e9f3e6c5475f702b.zip
chromium_src-434e72675f5b2ef5800a3619e9f3e6c5475f702b.tar.gz
chromium_src-434e72675f5b2ef5800a3619e9f3e6c5475f702b.tar.bz2
Reverting 23702.
Review URL: http://codereview.chromium.org/173343 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25442 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_mac.mm12
1 files changed, 0 insertions, 12 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
index ca63253..83b6214 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
@@ -363,18 +363,6 @@ void AutocompleteEditViewMac::ClosePopup() {
}
void AutocompleteEditViewMac::SetText(const std::wstring& display_text) {
- // Exit if an input method is composing text.
- // NSTextView finishes an ongoing composition when updating the value of an
- // NSTextField instance. This prevents inputting non-ASCII characters which
- // need input methods, such as Latin characters, CJK characters, etc.
- // To prevent updating this NSTextField value while an input method is
- // composing text, we check whether or not the field editor for this control
- // has marked text, text being composed by an input method, and return if
- // the editor has marked text.
- NSTextView* text_view = static_cast<NSTextView*>([field_ currentEditor]);
- if (text_view && [text_view hasMarkedText])
- return;
-
NSString* ss = base::SysWideToNSString(display_text);
NSMutableAttributedString* as =
[[[NSMutableAttributedString alloc] initWithString:ss] autorelease];