Add textfield internal padding from FocusableBorder.

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"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browsing_data/cookies_tree_model.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/parsed_cookie.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/window/dialog_delegate.h"
 
-namespace {
-
-// Adjustment to the spacing between subsequent label-field lines.
-const int kExtraLineHeightPadding = 3;
-
-}  // namespace
-
 ///////////////////////////////////////////////////////////////////////////////
 // CookieInfoView, public:
 
 CookieInfoView::CookieInfoView()
     : name_label_(NULL),
       name_value_field_(NULL),
       content_label_(NULL),
       content_value_field_(NULL),
       domain_label_(NULL),
       domain_value_field_(NULL),
@@ skipping 64 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookieInfoView, views::View overrides.
 
 void CookieInfoView::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.is_add && details.child == this)
     Init();
 }
 
-void CookieInfoView::AddLabelRow(int layout_id, views::GridLayout* layout,
+void CookieInfoView::AddLabelRow(int layout_id,
+                                 views::GridLayout* layout,
                                  views::Label* label,
-                                 views::Textfield* text_field) {
+                                 views::Textfield* textfield) {
   layout->StartRow(0, layout_id);
   layout->AddView(label);
-  layout->AddView(text_field, 2, 1, views::GridLayout::FILL,
-                  views::GridLayout::CENTER);
-  layout->AddPaddingRow(0, kExtraLineHeightPadding);
+  layout->AddView(
+      textfield, 2, 1, views::GridLayout::FILL, views::GridLayout::CENTER);
 
   // Now that the Textfield is in the view hierarchy, it can be initialized.
-  text_field->SetReadOnly(true);
-  text_field->SetBorder(views::Border::NullBorder());
+  textfield->SetReadOnly(true);
+  textfield->SetBorder(views::Border::NullBorder());
   // Color these borderless text areas the same as the containing dialog.
-  text_field->SetBackgroundColor(GetNativeTheme()->GetSystemColor(
+  textfield->SetBackgroundColor(GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_DialogBackground));
-  text_field->SetTextColor(SkColorSetRGB(0x78, 0x78, 0x78));
+  textfield->SetTextColor(SkColorSetRGB(0x78, 0x78, 0x78));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookieInfoView, private:
 
 void CookieInfoView::Init() {
   // Ensure we don't run this more than once and leak memory.
   DCHECK(!name_label_);
   name_label_ = new views::Label(
       l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_NAME_LABEL));
@@ skipping 38 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_);
 }