Merge NativeTextfieldViews into views::Textfield.

chrome/browser/ui/views/autofill/decorated_textfield.cc

 // Copyright 2013 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 "chrome/browser/ui/views/autofill/decorated_textfield.h"
 
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
 #include "chrome/browser/ui/views/autofill/tooltip_icon.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/focusable_border.h"
-#include "ui/views/controls/textfield/native_textfield_views.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 
 namespace {
 
 // Padding around icons inside DecoratedTextfields.
 const int kTextfieldIconPadding = 3;
 
 }  // namespace
 
 namespace autofill {
@@ skipping 94 matching lines @@
 }
 
 const char* DecoratedTextfield::GetClassName() const {
   return kViewClassName;
 }
 
 views::View* DecoratedTextfield::GetEventHandlerForRect(const gfx::Rect& rect) {
   views::View* handler = views::Textfield::GetEventHandlerForRect(rect);
   if (handler->GetClassName() == TooltipIcon::kViewClassName)
     return handler;
-  return textfield_view_;
+  return this;
 }
 
 void DecoratedTextfield::OnFocus() {
   views::Textfield::OnFocus();
   SchedulePaint();
 }
 
 void DecoratedTextfield::OnBlur() {
   views::Textfield::OnBlur();
   SchedulePaint();
@@ skipping 38 matching lines @@
       icon_view_->GetPreferredSize().width() + 2 * kTextfieldIconPadding : 0;
 
   bool is_rtl = base::i18n::IsRTL();
   SetHorizontalMargins(is_rtl ? icon_space : 0, is_rtl ? 0 : icon_space);
 
   Layout();
   SchedulePaint();
 }
 
 } // namespace autofill