summaryrefslogtreecommitdiffstats
path: root/ui/views/controls/textfield/native_textfield_views.cc
diff options
context:
space:
mode:
authorYukawa@chromium.org <Yukawa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-12 17:40:26 +0000
committerYukawa@chromium.org <Yukawa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-12 17:40:26 +0000
commit5105efdffd09027231ed8fed3dddd2e606905b7e (patch)
tree2bd0dacf6cb4313ccba9f38fe532c6fda177637a /ui/views/controls/textfield/native_textfield_views.cc
parent21bce6327340da5e13b5305629930919101f9c85 (diff)
downloadchromium_src-5105efdffd09027231ed8fed3dddd2e606905b7e.zip
chromium_src-5105efdffd09027231ed8fed3dddd2e606905b7e.tar.gz
chromium_src-5105efdffd09027231ed8fed3dddd2e606905b7e.tar.bz2
Revert r216992 and r221221 because they are no longer necessary
It turned out that r216992 and r221221 did not use views::InputMethod::On[Focus|Blur] in a documented way. According to the comment in ui/views/ime/input_method.h, views::InputMethod::On[Focus|Blur] are designed to be called only when the top-level widget gains or loses keyboard focus. (Probably it should be called as "activated"/"deactivated") To fix this complicated situation, I submitted r222304 as yet another fix for Issue 265337 and Issue 276720. With that change, r216992 and r221221 are no longer necessary as far as I've tested. BUG=265337,276720,287620 TEST=Manually done at Omnibox, Find Bar, Bookmark Bubble, and Edit Bookmark Dialog on Windows 7 Aura and non-Aura build. Also test with --enable-text-services-framework. Review URL: https://chromiumcodereview.appspot.com/23707029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222805 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/controls/textfield/native_textfield_views.cc')
-rw-r--r--ui/views/controls/textfield/native_textfield_views.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/ui/views/controls/textfield/native_textfield_views.cc b/ui/views/controls/textfield/native_textfield_views.cc
index 89fe039..7c54606 100644
--- a/ui/views/controls/textfield/native_textfield_views.cc
+++ b/ui/views/controls/textfield/native_textfield_views.cc
@@ -681,7 +681,6 @@ void NativeTextfieldViews::HandleFocus() {
GetRenderText()->set_focused(true);
is_cursor_visible_ = true;
SchedulePaint();
- GetInputMethod()->OnFocus();
OnCaretBoundsChanged();
// Start blinking cursor.
base::MessageLoop::current()->PostDelayedTask(
@@ -693,7 +692,6 @@ void NativeTextfieldViews::HandleFocus() {
void NativeTextfieldViews::HandleBlur() {
GetRenderText()->set_focused(false);
- GetInputMethod()->OnBlur();
// Stop blinking cursor.
cursor_timer_.InvalidateWeakPtrs();
if (is_cursor_visible_) {