Reland Merge NativeTextfieldViews into views::Textfield.

content/browser/web_contents/touch_editable_impl_aura.cc

 // Copyright (c) 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 "content/browser/web_contents/touch_editable_impl_aura.h"
 
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/render_widget_host.h"
@@ skipping 233 matching lines @@
 void TouchEditableImplAura::GetSelectionEndPoints(gfx::Rect* p1,
                                                   gfx::Rect* p2) {
   *p1 = selection_anchor_rect_;
   *p2 = selection_focus_rect_;
 }
 
 gfx::Rect TouchEditableImplAura::GetBounds() {
   return rwhva_ ? rwhva_->GetNativeView()->bounds() : gfx::Rect();
 }
 
-gfx::NativeView TouchEditableImplAura::GetNativeView() {
+gfx::NativeView TouchEditableImplAura::GetNativeView() const {
   return rwhva_ ? rwhva_->GetNativeView()->GetRootWindow() : NULL;
 }
 
 void TouchEditableImplAura::ConvertPointToScreen(gfx::Point* point) {
   if (!rwhva_)
     return;
   aura::Window* window = rwhva_->GetNativeView();
   aura::client::ScreenPositionClient* screen_position_client =
       aura::client::GetScreenPositionClient(window->GetRootWindow());
   if (screen_position_client)
@@ skipping 108 matching lines @@
     rwhva_ = NULL;
   }
   text_input_type_ = ui::TEXT_INPUT_TYPE_NONE;
   touch_selection_controller_.reset();
   handles_hidden_due_to_scroll_ = false;
   scroll_in_progress_ = false;
   overscroll_in_progress_ = false;
 }
 
 }  // namespace content