Fix InputMethod Widget activation checks; cleanup, etc.

Remove InputMethodBase::On[Focus|Blur] and |widget_focused_|.
Check widget()->IsActive() as needed instead of widget_focused_.
( this resolves improper init order firing DCHECKs in views_unittests )
( fixes FocusManagerDtorTest.* with --enable-views-textfield )
Fix NativeTextfieldViewsTest widget activation and textfield focus.

Rename virtual InputMethod::set_delegate() to SetDelegate().
Call the base Init from InputMethodBase::Init first.
( initializes |widget_| before it's used in OnInputLangChange )
Remove InputMethodBase's unnecessary NON_EXPORTED_BASE usage.
Add empty MockInputMethod::On[Focus|Blur] implementations.
Update comments for conciseness and clarity.

BUG=131660
TEST=No input regressions; unit tests pass with --enable-views-textfield.
R=sky@chromium.org,suzhe@chromium.org

Review URL: https://chromiumcodereview.appspot.com/12902029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191049 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 6 deletions

diff --git a/ui/views/controls/textfield/native_textfield_views_unittest.cc b/ui/views/controls/textfield/native_textfield_views_unittest.cc
index 9f8fffe..517c14d 100644
--- a/ui/views/controls/textfield/native_textfield_views_unittest.cc
+++ b/ui/views/controls/textfield/native_textfield_views_unittest.cc
@@ -172,7 +172,7 @@ class NativeTextfieldViewsTest : public ViewsTestBase,
     ASSERT_FALSE(textfield_);
     textfield_ = new TestTextfield(style);
     textfield_->SetController(this);
-    widget_ = new Widget;
+    widget_ = new Widget();
     Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
     params.bounds = gfx::Rect(100, 100, 100, 100);
     widget_->Init(params);
@@ -198,11 +198,8 @@ class NativeTextfieldViewsTest : public ViewsTestBase,
     input_method_ = new MockInputMethod();
     widget_->ReplaceInputMethod(input_method_);
 
-    // Assumes the Widget is always focused.
-    input_method_->OnFocus();
-
-    // TODO(msw): Determine why this requires two calls to work on Windows.
-    textfield_->RequestFocus();
+    // Activate the widget and focus the textfield for input handling.
+    widget_->Activate();
     textfield_->RequestFocus();
   }