Reland Merge NativeTextfieldViews into views::Textfield.

chrome/browser/ui/views/cookie_info_view.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 "chrome/browser/ui/views/cookie_info_view.h"
 
 #include <algorithm>
 
 #include "base/i18n/time_formatting.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 110 matching lines @@
                                  views::Label* label,
                                  views::Textfield* text_field) {
   layout->StartRow(0, layout_id);
   layout->AddView(label);
   layout->AddView(text_field, 2, 1, views::GridLayout::FILL,
                   views::GridLayout::CENTER);
   layout->AddPaddingRow(0, kExtraLineHeightPadding);
 
   // Now that the Textfield is in the view hierarchy, it can be initialized.
   text_field->SetReadOnly(true);
-  text_field->RemoveBorder();
+  text_field->set_border(NULL);
   // Color these borderless text areas the same as the containing dialog.
   text_field->SetBackgroundColor(GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_DialogBackground));
   text_field->SetTextColor(SkColorSetRGB(0x78, 0x78, 0x78));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookieInfoView, private:
 
 void CookieInfoView::Init() {
@@ skipping 42 matching lines @@
   AddLabelRow(three_column_layout_id, layout, domain_label_,
               domain_value_field_);
   AddLabelRow(three_column_layout_id, layout, path_label_, path_value_field_);
   AddLabelRow(three_column_layout_id, layout, send_for_label_,
               send_for_value_field_);
   AddLabelRow(three_column_layout_id, layout, created_label_,
               created_value_field_);
   AddLabelRow(three_column_layout_id, layout, expires_label_,
               expires_value_field_);
 }