Reland Merge NativeTextfieldViews into views::Textfield.

ui/views/ime/input_method_bridge.cc

 // Copyright (c) 2012 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.
 
 #include "ui/views/ime/input_method_bridge.h"
 
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/input_method_observer.h"
 #include "ui/events/event.h"
 #include "ui/gfx/rect.h"
@@ skipping 154 matching lines @@
   return host_->IsActive();
 }
 
 bool InputMethodBridge::IsCandidatePopupOpen() const {
   DCHECK(host_);
 
   return host_->IsCandidatePopupOpen();
 }
 
 // Overridden from TextInputClient. Forward an event from the system-wide IME
-// to the text input |client|, which is e.g. views::NativeTextfieldViews.
+// to the text input |client|, which is e.g. views::Textfield.
 void InputMethodBridge::SetCompositionText(
     const ui::CompositionText& composition) {
   TextInputClient* client = GetTextInputClient();
   if (client)
     client->SetCompositionText(composition);
 }
 
 void InputMethodBridge::ConfirmCompositionText() {
   TextInputClient* client = GetTextInputClient();
   if (client)
@@ skipping 140 matching lines @@
   OnTextInputTypeChanged(focused);
   OnCaretBoundsChanged(focused);
 }
 
 ui::InputMethod* InputMethodBridge::GetHostInputMethod() const {
   return host_;
 }
 
 
 }  // namespace views