views: Move more layout constants to the views namespace. Part 3.

The other constants will be moved in future patches.

BUG=None
TEST=trybots

Review URL: http://codereview.chromium.org/6480016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74522 0039d316-1c4b-4281-b951-d872f2087c98

44 files changed, 243 insertions, 239 deletions

diff --git a/chrome/browser/ui/views/about_chrome_view.cc b/chrome/browser/ui/views/about_chrome_view.cc
index 7e79d3d..c85d95c 100644
--- a/chrome/browser/ui/views/about_chrome_view.cc
+++ b/chrome/browser/ui/views/about_chrome_view.cc
@@ -295,13 +295,13 @@ void AboutChromeView::Init() {
 
   // Add up the height of the various elements on the page.
   int height = about_background_logo->height() +
-               kRelatedControlVerticalSpacing +
+               views::kRelatedControlVerticalSpacing +
                // Copyright line.
                font.GetHeight() +
                // Main label.
                dummy_text.GetHeightForWidth(
                    dialog_dimensions_.width() - (2 * kPanelHorizMargin)) +
-               kRelatedControlVerticalSpacing;
+               views::kRelatedControlVerticalSpacing;
 
 #if defined(GOOGLE_CHROME_BUILD)
   std::vector<size_t> url_offsets;
@@ -320,7 +320,7 @@ void AboutChromeView::Init() {
   terms_of_service_url_->SetController(this);
 
   // Add the Terms of Service line and some whitespace.
-  height += font.GetHeight() + kRelatedControlVerticalSpacing;
+  height += font.GetHeight() + views::kRelatedControlVerticalSpacing;
 #endif
 
   // Use whichever is greater (the calculated height or the specified minimum
@@ -355,7 +355,7 @@ void AboutChromeView::Layout() {
   version_label_->SetBounds(kPanelHorizMargin,
                             about_title_label_->y() +
                                 about_title_label_->height() +
-                                kRelatedControlVerticalSpacing,
+                                views::kRelatedControlVerticalSpacing,
                             kVersionFieldWidth,
                             sz.height());
 
@@ -366,14 +366,14 @@ void AboutChromeView::Layout() {
       kPanelHorizMargin,
       version_label_->y() +
           version_label_->height() +
-          kRelatedControlVerticalSpacing,
+          views::kRelatedControlVerticalSpacing,
       kVersionFieldWidth,
       sz.height());
 #endif
 
   // For the width of the main text label we want to use up the whole panel
   // width and remaining height, minus a little margin on each side.
-  int y_pos = background_image_height + kRelatedControlVerticalSpacing;
+  int y_pos = background_image_height + views::kRelatedControlVerticalSpacing;
   sz.set_width(panel_size.width() - 2 * kPanelHorizMargin);
 
   // Draw the text right below the background image.
@@ -420,7 +420,7 @@ void AboutChromeView::Layout() {
   // variable length messages.
   sz = update_label_.GetPreferredSize();
   int update_label_x = throbber_->x() + throbber_->width() +
-                       kRelatedControlHorizontalSpacing;
+                       views::kRelatedControlHorizontalSpacing;
   update_label_.SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   update_label_.SetBounds(update_label_x,
                           throbber_topleft_y + 1,
@@ -472,7 +472,7 @@ void AboutChromeView::Paint(gfx::Canvas* canvas) {
 #if defined(GOOGLE_CHROME_BUILD)
   // Insert a line break and some whitespace.
   position.set_width(0);
-  position.Enlarge(0, font.GetHeight() + kRelatedControlVerticalSpacing);
+  position.Enlarge(0, font.GetHeight() + views::kRelatedControlVerticalSpacing);
 
   // And now the Terms of Service and position the TOS url.
   view_text_utils::DrawTextAndPositionUrl(canvas, main_text_label_,
diff --git a/chrome/browser/ui/views/about_ipc_dialog.cc b/chrome/browser/ui/views/about_ipc_dialog.cc
index 0e77260..12fe150 100644
--- a/chrome/browser/ui/views/about_ipc_dialog.cc
+++ b/chrome/browser/ui/views/about_ipc_dialog.cc
@@ -251,7 +251,7 @@ void AboutIPCDialog::SetupControls() {
   layout->AddView(track_toggle_);
   layout->AddView(clear_button_);
   layout->AddView(filter_button_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(1.0f, table_column_set);
   layout->AddView(table_);
 }
diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
index 19f2804..e507df5 100644
--- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
+++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
@@ -214,7 +214,7 @@ class AutocompletePopupContentsView::InstantOptInView
     views::ColumnSet* column_set = layout->AddColumnSet(first_column_set);
     column_set->AddColumn(views::GridLayout::TRAILING, v_align, 1,
                           views::GridLayout::USE_PREF, 0, 0);
-    column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+    column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
     column_set->AddColumn(views::GridLayout::CENTER, v_align, 0,
                           views::GridLayout::USE_PREF, 0, 0);
     column_set->AddPaddingColumn(0, kOptInButtonPadding);
diff --git a/chrome/browser/ui/views/autofill_profiles_view_win.cc b/chrome/browser/ui/views/autofill_profiles_view_win.cc
index 44ad2af..04ca0e1 100644
--- a/chrome/browser/ui/views/autofill_profiles_view_win.cc
+++ b/chrome/browser/ui/views/autofill_profiles_view_win.cc
@@ -476,14 +476,14 @@ void AutoFillProfilesView::Init() {
       layout->AddColumnSet(table_with_buttons_column_view_set_id);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
                         views::GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER, 0,
                         views::GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, table_with_buttons_column_view_set_id);
   layout->AddView(enable_auto_fill_button_, 3, 1, views::GridLayout::FILL,
                   views::GridLayout::FILL);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, table_with_buttons_column_view_set_id);
   layout->AddView(scroll_view_, 1, 8, views::GridLayout::FILL,
@@ -491,17 +491,17 @@ void AutoFillProfilesView::Init() {
   layout->AddView(add_address_button_);
 
   layout->StartRowWithPadding(0, table_with_buttons_column_view_set_id, 0,
-                              kRelatedControlVerticalSpacing);
+                              views::kRelatedControlVerticalSpacing);
   layout->SkipColumns(2);
   layout->AddView(add_credit_card_button_);
 
   layout->StartRowWithPadding(0, table_with_buttons_column_view_set_id, 0,
-                              kRelatedControlVerticalSpacing);
+                              views::kRelatedControlVerticalSpacing);
   layout->SkipColumns(2);
   layout->AddView(edit_button_);
 
   layout->StartRowWithPadding(0, table_with_buttons_column_view_set_id, 0,
-                              kRelatedControlVerticalSpacing);
+                              views::kRelatedControlVerticalSpacing);
   layout->SkipColumns(2);
   layout->AddView(remove_button_);
 
@@ -629,7 +629,7 @@ void AutoFillProfilesView::PhoneSubView::ViewHierarchyChanged(
         layout->AddColumnSet(two_column_fill_view_set_id);
     column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER, 1,
         views::GridLayout::USE_PREF, 0, 0);
-    column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+    column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
     column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER, 0,
         views::GridLayout::USE_PREF, 0, 0);
     layout->StartRow(0, two_column_fill_view_set_id);
@@ -926,21 +926,21 @@ void AutoFillProfilesView::EditableSetViewContents::InitAddressFields(
         AutoFillType(address_fields_[field].type)));
   }
 
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, double_column_fill_view_set_id_);
   layout->AddView(CreateLeftAlignedLabel(IDS_AUTOFILL_DIALOG_FULL_NAME));
 
   layout->StartRow(0, double_column_fill_view_set_id_);
   layout->AddView(text_fields_[TEXT_FULL_NAME]);
 
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, double_column_fill_view_set_id_);
   layout->AddView(CreateLeftAlignedLabel(IDS_AUTOFILL_DIALOG_COMPANY_NAME));
 
   layout->StartRow(0, double_column_fill_view_set_id_);
   layout->AddView(text_fields_[TEXT_COMPANY]);
 
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, double_column_leading_view_set_id_);
   layout->AddView(new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
                   IDS_AUTOFILL_DIALOG_ADDRESS_LINE_1))));
@@ -948,7 +948,7 @@ void AutoFillProfilesView::EditableSetViewContents::InitAddressFields(
   layout->StartRow(0, double_column_fill_view_set_id_);
   layout->AddView(text_fields_[TEXT_ADDRESS_LINE_1]);
 
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, double_column_leading_view_set_id_);
   layout->AddView(new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
                   IDS_AUTOFILL_DIALOG_ADDRESS_LINE_2))));
@@ -956,7 +956,7 @@ void AutoFillProfilesView::EditableSetViewContents::InitAddressFields(
   layout->StartRow(0, double_column_fill_view_set_id_);
   layout->AddView(text_fields_[TEXT_ADDRESS_LINE_2]);
 
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, triple_column_fill_view_set_id_);
   layout->AddView(CreateLeftAlignedLabel(IDS_AUTOFILL_DIALOG_CITY));
   layout->AddView(CreateLeftAlignedLabel(IDS_AUTOFILL_DIALOG_STATE));
@@ -971,7 +971,7 @@ void AutoFillProfilesView::EditableSetViewContents::InitAddressFields(
   layout->AddView(text_fields_[TEXT_ADDRESS_STATE]);
   layout->AddView(text_fields_[TEXT_ADDRESS_ZIP]);
 
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, double_column_fill_view_set_id_);
   layout->AddView(CreateLeftAlignedLabel(IDS_AUTOFILL_DIALOG_COUNTRY));
 
@@ -994,12 +994,12 @@ void AutoFillProfilesView::EditableSetViewContents::InitAddressFields(
 
   phone_sub_views_.push_back(fax);
 
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, double_column_fill_view_set_id_);
   layout->AddView(phone);
   layout->AddView(fax);
 
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, double_column_fill_view_set_id_);
   layout->AddView(CreateLeftAlignedLabel(IDS_AUTOFILL_DIALOG_EMAIL));
 
@@ -1047,14 +1047,14 @@ void AutoFillProfilesView::EditableSetViewContents::InitCreditCardFields(
     text_fields_[credit_card_fields_[field].text_field]->SetText(field_text);
   }
 
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, double_column_fill_view_set_id_);
   layout->AddView(CreateLeftAlignedLabel(IDS_AUTOFILL_DIALOG_NAME_ON_CARD));
   layout->StartRow(0, double_column_fill_view_set_id_);
   layout->AddView(text_fields_[TEXT_CC_NAME]);
 
   // Layout credit card info
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, double_column_ccnumber_cvc_);
   layout->AddView(
       CreateLeftAlignedLabel(IDS_AUTOFILL_DIALOG_CREDIT_CARD_NUMBER));
@@ -1063,7 +1063,7 @@ void AutoFillProfilesView::EditableSetViewContents::InitCreditCardFields(
   text_fields_[TEXT_CC_NUMBER]->set_default_width_in_chars(20);
   layout->AddView(text_fields_[TEXT_CC_NUMBER]);
 
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, double_column_ccexpiration_);
   layout->AddView(
       CreateLeftAlignedLabel(IDS_AUTOFILL_DIALOG_EXPIRATION_DATE), 3, 1);
@@ -1096,28 +1096,28 @@ void AutoFillProfilesView::EditableSetViewContents::InitLayoutGrid(
   int i;
   for (i = 0; i < 2; ++i) {
     if (i)
-      column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+      column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
     column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER, 1,
                           views::GridLayout::USE_PREF, 0, 0);
   }
   column_set = layout->AddColumnSet(double_column_leading_view_set_id_);
   for (i = 0; i < 2; ++i) {
     if (i)
-      column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+      column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
     column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
                           1, views::GridLayout::USE_PREF, 0, 0);
   }
   column_set = layout->AddColumnSet(triple_column_fill_view_set_id_);
   for (i = 0; i < 3; ++i) {
     if (i)
-      column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+      column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
     column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER, 1,
                           views::GridLayout::USE_PREF, 0, 0);
   }
   column_set = layout->AddColumnSet(triple_column_leading_view_set_id_);
   for (i = 0; i < 3; ++i) {
     if (i)
-      column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+      column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
     column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
                           1, views::GridLayout::USE_PREF, 0, 0);
   }
@@ -1125,13 +1125,13 @@ void AutoFillProfilesView::EditableSetViewContents::InitLayoutGrid(
   column_set = layout->AddColumnSet(four_column_city_state_zip_set_id_);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
                         16, views::GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
                         16, views::GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
                         5, views::GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
                         11, views::GridLayout::USE_PREF, 0, 0);
 
@@ -1139,7 +1139,7 @@ void AutoFillProfilesView::EditableSetViewContents::InitLayoutGrid(
   // Number and CVC are in ratio 20:4
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
                         20, views::GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
                         4, views::GridLayout::USE_PREF, 0, 0);
 
@@ -1153,7 +1153,7 @@ void AutoFillProfilesView::EditableSetViewContents::InitLayoutGrid(
   column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
                         0, views::GridLayout::FIXED,
                         font.GetStringWidth(ASCIIToUTF16("000000")), 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
                         0, views::GridLayout::FIXED,
                         font.GetStringWidth(ASCIIToUTF16("00000000")), 0);
@@ -1161,10 +1161,10 @@ void AutoFillProfilesView::EditableSetViewContents::InitLayoutGrid(
   column_set = layout->AddColumnSet(three_column_header_);
   column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::FILL,
                         0, views::GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
                         1, views::GridLayout::FIXED, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
                         1, views::GridLayout::FIXED, 0, 0);
 }
diff --git a/chrome/browser/ui/views/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmark_bubble_view.cc
index b5601b4..d9660c0 100644
--- a/chrome/browser/ui/views/bookmark_bubble_view.cc
+++ b/chrome/browser/ui/views/bookmark_bubble_view.cc
@@ -228,13 +228,13 @@ void BookmarkBubbleView::Init() {
   cs = layout->AddColumnSet(2);
   cs->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                 GridLayout::USE_PREF, 0, 0);
-  cs->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  cs->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   cs->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                 GridLayout::USE_PREF, 0, kMinimumFieldSize);
 
   // Bottom (buttons) row.
   cs = layout->AddColumnSet(3);
-  cs->AddPaddingColumn(1, kRelatedControlHorizontalSpacing);
+  cs->AddPaddingColumn(1, views::kRelatedControlHorizontalSpacing);
   cs->AddColumn(GridLayout::LEADING, GridLayout::TRAILING, 0,
                 GridLayout::USE_PREF, 0, 0);
   // We subtract 2 to account for the natural button padding, and
@@ -248,7 +248,7 @@ void BookmarkBubbleView::Init() {
   layout->AddView(title_label);
   layout->AddView(remove_link_);
 
-  layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
   layout->StartRow(0, 2);
   layout->AddView(new Label(UTF16ToWide(
       l10n_util::GetStringUTF16(IDS_BOOMARK_BUBBLE_TITLE_TEXT))));
@@ -256,12 +256,12 @@ void BookmarkBubbleView::Init() {
   title_tf_->SetText(GetTitle());
   layout->AddView(title_tf_);
 
-  layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
 
   layout->StartRow(0, 2);
   layout->AddView(combobox_label);
   layout->AddView(parent_combobox_);
-  layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
 
   layout->StartRow(0, 3);
   layout->AddView(edit_button_);
diff --git a/chrome/browser/ui/views/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmark_editor_view.cc
index 05aae5b..bc94312 100644
--- a/chrome/browser/ui/views/bookmark_editor_view.cc
+++ b/chrome/browser/ui/views/bookmark_editor_view.cc
@@ -324,7 +324,7 @@ void BookmarkEditorView::Init() {
   ColumnSet* column_set = layout->AddColumnSet(labels_column_set_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
 
@@ -335,10 +335,10 @@ void BookmarkEditorView::Init() {
   column_set = layout->AddColumnSet(buttons_column_set_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::LEADING, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(1, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(1, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::LEADING, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::LEADING, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->LinkColumnSizes(0, 2, 4, -1);
@@ -349,7 +349,7 @@ void BookmarkEditorView::Init() {
   layout->AddView(&title_tf_);
 
   if (details_.type != EditDetails::NEW_FOLDER) {
-    layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+    layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
     layout->StartRow(0, labels_column_set_id);
     layout->AddView(url_label_);
@@ -357,12 +357,12 @@ void BookmarkEditorView::Init() {
   }
 
   if (show_tree_) {
-    layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+    layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
     layout->StartRow(1, single_column_view_set_id);
     layout->AddView(tree_view_);
   }
 
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   if (!show_tree_ || bb_model_->IsLoaded())
     Reset();
diff --git a/chrome/browser/ui/views/clear_browsing_data.cc b/chrome/browser/ui/views/clear_browsing_data.cc
index b2b54e0..3b572c2 100644
--- a/chrome/browser/ui/views/clear_browsing_data.cc
+++ b/chrome/browser/ui/views/clear_browsing_data.cc
@@ -156,7 +156,7 @@ void ClearBrowsingDataView::Init() {
   }
   column_set->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
   layout->StartRow(1, 0);
@@ -186,42 +186,42 @@ void ClearBrowsingDataView::Layout() {
   del_history_checkbox_->SetBounds(2 * kPanelHorizMargin,
                                    delete_all_label_->y() +
                                        delete_all_label_->height() +
-                                       kRelatedControlVerticalSpacing,
+                                       views::kRelatedControlVerticalSpacing,
                                    sz.width(), sz.height());
 
   sz = del_downloads_checkbox_->GetPreferredSize();
   del_downloads_checkbox_->SetBounds(2 * kPanelHorizMargin,
                                      del_history_checkbox_->y() +
                                          del_history_checkbox_->height() +
-                                         kRelatedControlVerticalSpacing,
+                                         views::kRelatedControlVerticalSpacing,
                                      sz.width(), sz.height());
 
   sz = del_cache_checkbox_->GetPreferredSize();
   del_cache_checkbox_->SetBounds(2 * kPanelHorizMargin,
                                  del_downloads_checkbox_->y() +
                                      del_downloads_checkbox_->height() +
-                                     kRelatedControlVerticalSpacing,
+                                     views::kRelatedControlVerticalSpacing,
                                  sz.width(), sz.height());
 
   sz = del_cookies_checkbox_->GetPreferredSize();
   del_cookies_checkbox_->SetBounds(2 * kPanelHorizMargin,
                                    del_cache_checkbox_->y() +
                                        del_cache_checkbox_->height() +
-                                       kRelatedControlVerticalSpacing,
+                                       views::kRelatedControlVerticalSpacing,
                                    sz.width(), sz.height());
 
   sz = del_passwords_checkbox_->GetPreferredSize();
   del_passwords_checkbox_->SetBounds(2 * kPanelHorizMargin,
                                      del_cookies_checkbox_->y() +
                                          del_cookies_checkbox_->height() +
-                                         kRelatedControlVerticalSpacing,
+                                         views::kRelatedControlVerticalSpacing,
                                      sz.width(), sz.height());
 
   sz = del_form_data_checkbox_->GetPreferredSize();
   del_form_data_checkbox_->SetBounds(2 * kPanelHorizMargin,
                                      del_passwords_checkbox_->y() +
                                          del_passwords_checkbox_->height() +
-                                         kRelatedControlVerticalSpacing,
+                                         views::kRelatedControlVerticalSpacing,
                                      sz.width(), sz.height());
 
   // Time period label is next below the combo boxes.
@@ -229,7 +229,7 @@ void ClearBrowsingDataView::Layout() {
   time_period_label_->SetBounds(kPanelHorizMargin,
                                 del_form_data_checkbox_->y() +
                                     del_form_data_checkbox_->height() +
-                                    kRelatedControlVerticalSpacing +
+                                    views::kRelatedControlVerticalSpacing +
                                     kExtraMarginForTimePeriodLabel,
                                 sz.width(), sz.height());
 
@@ -239,7 +239,7 @@ void ClearBrowsingDataView::Layout() {
   sz = time_period_combobox_->GetPreferredSize();
   time_period_combobox_->SetBounds(time_period_label_->x() +
                                        time_period_label_->width() +
-                                       kRelatedControlVerticalSpacing,
+                                       views::kRelatedControlVerticalSpacing,
                                    time_period_label_->y() -
                                        ((sz.height() - label_y_size) / 2),
                                    sz.width(), sz.height());
@@ -348,7 +348,7 @@ views::ClientView* ClearBrowsingDataView::CreateClientView(
                         GridLayout::USE_PREF, 0, 0);
   layout->StartRow(0, 0);
   layout->AddView(new views::Separator());
-  layout->StartRowWithPadding(0, 0, 0, kRelatedControlVerticalSpacing);
+  layout->StartRowWithPadding(0, 0, 0, views::kRelatedControlVerticalSpacing);
   layout->AddView(flash_link, 1, 1, GridLayout::LEADING, GridLayout::CENTER);
 
   views::DialogClientView* client_view =
diff --git a/chrome/browser/ui/views/clear_browsing_data_view.cc b/chrome/browser/ui/views/clear_browsing_data_view.cc
index 7c8f3e0..6fbcabb 100644
--- a/chrome/browser/ui/views/clear_browsing_data_view.cc
+++ b/chrome/browser/ui/views/clear_browsing_data_view.cc
@@ -149,7 +149,7 @@ void ClearBrowsingDataView2::Init() {
   }
   column_set->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
   layout->StartRow(1, 0);
@@ -176,7 +176,7 @@ void ClearBrowsingDataView2::InitControlLayout() {
   column_set = layout->AddColumnSet(two_column_set_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
 
@@ -188,32 +188,32 @@ void ClearBrowsingDataView2::InitControlLayout() {
   // Delete All label goes to the top left corner.
   layout->StartRow(0, leading_column_set_id);
   layout->AddView(delete_all_label_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Check-boxes go beneath it (with a little indentation).
   layout->StartRow(0, indented_column_set_id);
   layout->AddView(del_history_checkbox_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, indented_column_set_id);
   layout->AddView(del_downloads_checkbox_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, indented_column_set_id);
   layout->AddView(del_cache_checkbox_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, indented_column_set_id);
   layout->AddView(del_cookies_checkbox_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, indented_column_set_id);
   layout->AddView(del_passwords_checkbox_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, indented_column_set_id);
   layout->AddView(del_form_data_checkbox_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Time period label is next below the combo boxes followed by time
   // period combo box
diff --git a/chrome/browser/ui/views/clear_server_data.cc b/chrome/browser/ui/views/clear_server_data.cc
index 1658c4f..86d12b4 100644
--- a/chrome/browser/ui/views/clear_server_data.cc
+++ b/chrome/browser/ui/views/clear_server_data.cc
@@ -129,10 +129,10 @@ void ClearServerDataView::InitControlLayout() {
   column_set = layout->AddColumnSet(three_column_set_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
 
@@ -207,7 +207,7 @@ void ClearServerDataView::AddWrappingLabelRow(views::GridLayout* layout,
 void ClearServerDataView::AddSpacing(views::GridLayout* layout,
                                      bool related_follows) {
   layout->AddPaddingRow(
-      0, related_follows ? kRelatedControlVerticalSpacing
+      0, related_follows ? views::kRelatedControlVerticalSpacing
                          : views::kUnrelatedControlVerticalSpacing);
 }
 
diff --git a/chrome/browser/ui/views/collected_cookies_win.cc b/chrome/browser/ui/views/collected_cookies_win.cc
index 36d3f3d..5c7e45e 100644
--- a/chrome/browser/ui/views/collected_cookies_win.cc
+++ b/chrome/browser/ui/views/collected_cookies_win.cc
@@ -114,7 +114,7 @@ class InfobarView : public views::View {
         new views::BoxLayout(views::BoxLayout::kHorizontal,
                              kInfobarHorizontalPadding,
                              kInfobarVerticalPadding,
-                             kRelatedControlSmallHorizontalSpacing));
+                             views::kRelatedControlSmallHorizontalSpacing));
     content_->AddChildView(info_image_);
     content_->AddChildView(label_);
     UpdateVisibility(false, CONTENT_SETTING_BLOCK, std::wstring());
@@ -127,14 +127,14 @@ class InfobarView : public views::View {
 
     // Add space around the banner.
     gfx::Size size(content_->GetPreferredSize());
-    size.Enlarge(0, 2 * kRelatedControlVerticalSpacing);
+    size.Enlarge(0, 2 * views::kRelatedControlVerticalSpacing);
     return size;
   }
 
   virtual void Layout() {
     content_->SetBounds(
-        0, kRelatedControlVerticalSpacing,
-        width(), height() - kRelatedControlVerticalSpacing);
+        0, views::kRelatedControlVerticalSpacing,
+        width(), height() - views::kRelatedControlVerticalSpacing);
   }
 
   virtual void ViewHierarchyChanged(bool is_add,
@@ -234,19 +234,19 @@ void CollectedCookiesWin::Init() {
   column_set = layout->AddColumnSet(three_columns_layout_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, single_column_layout_id);
   layout->AddView(allowed_label_);
 
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(1, single_column_layout_id);
   layout->AddView(
       allowed_cookies_tree_, 1, 1, GridLayout::FILL, GridLayout::FILL,
       kTreeViewWidth, kTreeViewHeight);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, single_column_layout_id);
   block_allowed_button_ = new views::NativeButton(this, UTF16ToWide(
@@ -263,12 +263,12 @@ void CollectedCookiesWin::Init() {
   layout->StartRow(0, single_column_layout_id);
   layout->AddView(blocked_label_, 1, 1, GridLayout::FILL, GridLayout::FILL);
 
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(1, single_column_layout_id);
   layout->AddView(
       blocked_cookies_tree_, 1, 1, GridLayout::FILL, GridLayout::FILL,
       kTreeViewWidth, kTreeViewHeight);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, three_columns_layout_id);
   allow_blocked_button_ = new views::NativeButton(this, UTF16ToWide(
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc
index 1fa8a2f..47589e1 100644
--- a/chrome/browser/ui/views/content_setting_bubble_contents.cc
+++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc
@@ -214,7 +214,7 @@ void ContentSettingBubbleContents::InitControlLayout() {
   const std::set<std::string>& plugins = bubble_content.resource_identifiers;
   if (!plugins.empty()) {
     if (!bubble_content_empty)
-      layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+      layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
     for (std::set<std::string>::const_iterator it = plugins.begin();
         it != plugins.end(); ++it) {
       std::wstring name = UTF16ToWide(
@@ -234,7 +234,8 @@ void ContentSettingBubbleContents::InitControlLayout() {
         layout->AddColumnSet(popup_column_set_id);
     popup_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 0,
                                 GridLayout::USE_PREF, 0, 0);
-    popup_column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+    popup_column_set->AddPaddingColumn(
+        0, views::kRelatedControlHorizontalSpacing);
     popup_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
                                 GridLayout::USE_PREF, 0, 0);
 
@@ -242,7 +243,7 @@ void ContentSettingBubbleContents::InitControlLayout() {
          i(bubble_content.popup_items.begin());
          i != bubble_content.popup_items.end(); ++i) {
       if (!bubble_content_empty)
-        layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+        layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
       layout->StartRow(0, popup_column_set_id);
 
       views::Link* link = new views::Link(UTF8ToWide(i->title));
@@ -265,7 +266,7 @@ void ContentSettingBubbleContents::InitControlLayout() {
       radio->set_listener(this);
       radio_group_.push_back(radio);
       if (!bubble_content_empty)
-        layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+        layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
       layout->StartRow(0, single_column_set_id);
       layout->AddView(radio);
       bubble_content_empty = false;
@@ -306,18 +307,18 @@ void ContentSettingBubbleContents::InitControlLayout() {
     custom_link_->SetEnabled(bubble_content.custom_link_enabled);
     custom_link_->SetController(this);
     if (!bubble_content_empty)
-      layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+      layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
     layout->StartRow(0, single_column_set_id);
     layout->AddView(custom_link_);
     bubble_content_empty = false;
   }
 
   if (!bubble_content_empty) {
-    layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+    layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
     layout->StartRow(0, single_column_set_id);
     layout->AddView(new views::Separator, 1, 1,
                     GridLayout::FILL, GridLayout::FILL);
-    layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+    layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   }
 
   const int double_column_set_id = 1;
diff --git a/chrome/browser/ui/views/cookie_info_view.cc b/chrome/browser/ui/views/cookie_info_view.cc
index 418fce9..9d4f297 100644
--- a/chrome/browser/ui/views/cookie_info_view.cc
+++ b/chrome/browser/ui/views/cookie_info_view.cc
@@ -163,7 +163,7 @@ void CookieInfoView::AddLabelRow(int layout_id, views::GridLayout* layout,
   layout->AddView(label);
   layout->AddView(value, 2, 1, views::GridLayout::FILL,
                   views::GridLayout::CENTER);
-  layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
 }
 
 void CookieInfoView::AddControlRow(int layout_id, views::GridLayout* layout,
@@ -171,7 +171,7 @@ void CookieInfoView::AddControlRow(int layout_id, views::GridLayout* layout,
   layout->StartRow(0, layout_id);
   layout->AddView(label);
   layout->AddView(control, 1, 1);
-  layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -225,7 +225,7 @@ void CookieInfoView::Init() {
   ColumnSet* column_set = layout->AddColumnSet(three_column_layout_id);
   column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc
index a998365..cc12d2c 100644
--- a/chrome/browser/ui/views/create_application_shortcut_view.cc
+++ b/chrome/browser/ui/views/create_application_shortcut_view.cc
@@ -289,13 +289,13 @@ void CreateApplicationShortcutView::InitControls() {
   layout->AddView(desktop_check_box_);
 
   if (menu_check_box_ != NULL) {
-    layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
+    layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
     layout->StartRow(0, kTableColumnSetId);
     layout->AddView(menu_check_box_);
   }
 
   if (quick_launch_check_box_ != NULL) {
-    layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
+    layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
     layout->StartRow(0, kTableColumnSetId);
     layout->AddView(quick_launch_check_box_);
   }
diff --git a/chrome/browser/ui/views/database_info_view.cc b/chrome/browser/ui/views/database_info_view.cc
index 6596ec1..0f0d6e4 100644
--- a/chrome/browser/ui/views/database_info_view.cc
+++ b/chrome/browser/ui/views/database_info_view.cc
@@ -111,7 +111,7 @@ void DatabaseInfoView::Init() {
   views::ColumnSet* column_set = layout->AddColumnSet(three_column_layout_id);
   column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
@@ -121,11 +121,11 @@ void DatabaseInfoView::Init() {
   layout->StartRow(0, three_column_layout_id);
   layout->AddView(description_label);
   layout->AddView(description_value_field_);
-  layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
   layout->StartRow(0, three_column_layout_id);
   layout->AddView(size_label);
   layout->AddView(size_value_field_);
-  layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
   layout->StartRow(0, three_column_layout_id);
   layout->AddView(last_modified_label);
   layout->AddView(last_modified_value_field_);
diff --git a/chrome/browser/ui/views/default_search_view.cc b/chrome/browser/ui/views/default_search_view.cc
index fd6f5d9..3dea858 100644
--- a/chrome/browser/ui/views/default_search_view.cc
+++ b/chrome/browser/ui/views/default_search_view.cc
@@ -244,7 +244,8 @@ void DefaultSearchView::SetupControls(PrefService* prefs) {
   choices_column_set->AddPaddingColumn(1, kPanelVertMargin);
   choices_column_set->AddColumn(GridLayout::CENTER, GridLayout::CENTER,
                                 1, GridLayout::USE_PREF, 0, 0);
-  choices_column_set->AddPaddingColumn(1, kRelatedControlHorizontalSpacing);
+  choices_column_set->AddPaddingColumn(
+      1, views::kRelatedControlHorizontalSpacing);
   choices_column_set->AddColumn(GridLayout::CENTER, GridLayout::CENTER,
                                 1, GridLayout::USE_PREF, 0, 0);
   choices_column_set->LinkColumnSizes(0, 2, -1);
@@ -275,19 +276,19 @@ void DefaultSearchView::SetupControls(PrefService* prefs) {
 
   // Add the labels for the tops of the choices.
   layout->StartRowWithPadding(0, kChoicesViewSetId,
-                              0, kRelatedControlVerticalSpacing);
+                              0, views::kRelatedControlVerticalSpacing);
   layout->AddView(CreateProviderLabel(IDS_DEFAULT_SEARCH_LABEL_CURRENT));
   layout->AddView(CreateProviderLabel(IDS_DEFAULT_SEARCH_LABEL_PROPOSED));
 
   // Add the logos.
   layout->StartRowWithPadding(0, kChoicesViewSetId,
-                              0, kRelatedControlVerticalSpacing);
+                              0, views::kRelatedControlVerticalSpacing);
   layout->AddView(CreateProviderLogo(default_logo_id, default_short_name));
   layout->AddView(CreateProviderLogo(proposed_logo_id, proposed_short_name));
 
   // Add the buttons.
   layout->StartRowWithPadding(0, kChoicesViewSetId,
-                              0, kRelatedControlVerticalSpacing);
+                              0, views::kRelatedControlVerticalSpacing);
   default_provider_button_ = CreateProviderChoiceButton(
       this,
       IDS_DEFAULT_SEARCH_PROMPT_CURRENT,
diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc
index a055f23..e7f48f2 100644
--- a/chrome/browser/ui/views/edit_search_engine_dialog.cc
+++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc
@@ -142,8 +142,8 @@ void EditSearchEngineDialog::Init() {
 
   UpdateImageViews();
 
-  const int related_x = kRelatedControlHorizontalSpacing;
-  const int related_y = kRelatedControlVerticalSpacing;
+  const int related_x = views::kRelatedControlHorizontalSpacing;
+  const int related_y = views::kRelatedControlVerticalSpacing;
   const int unrelated_y = views::kUnrelatedControlVerticalSpacing;
 
   // View and GridLayout take care of deleting GridLayout for us.
diff --git a/chrome/browser/ui/views/extensions/extension_install_prompt2.cc b/chrome/browser/ui/views/extensions/extension_install_prompt2.cc
index 0642811..92069af 100644
--- a/chrome/browser/ui/views/extensions/extension_install_prompt2.cc
+++ b/chrome/browser/ui/views/extensions/extension_install_prompt2.cc
@@ -223,16 +223,16 @@ gfx::Size InstallDialogContent2::GetPreferredSize() {
   height += heading_->GetHeightForWidth(right_column_width_);
 
   if (permission_box_) {
-    height += kRelatedControlVerticalSpacing;
+    height += views::kRelatedControlVerticalSpacing;
     height += will_have_access_to_->GetHeightForWidth(right_column_width_);
 
-    height += kRelatedControlVerticalSpacing;
+    height += views::kRelatedControlVerticalSpacing;
     height += kPermissionBoxBorderWidth * 2;
     height += kPermissionBoxVerticalPadding * 2;
 
     for (size_t i = 0; i < permissions_.size(); ++i) {
       if (i > 0)
-        height += kRelatedControlVerticalSpacing;
+        height += views::kRelatedControlVerticalSpacing;
       height += permissions_[0]->GetHeightForWidth(kPermissionLabelWidth);
     }
   }
@@ -262,13 +262,13 @@ void InstallDialogContent2::Layout() {
   heading_->SetY(y);
   y += heading_->height();
 
-  y += kRelatedControlVerticalSpacing;
+  y += views::kRelatedControlVerticalSpacing;
   will_have_access_to_->SizeToFit(right_column_width_);
   will_have_access_to_->SetX(x);
   will_have_access_to_->SetY(y);
   y += will_have_access_to_->height();
 
-  y += kRelatedControlVerticalSpacing;
+  y += views::kRelatedControlVerticalSpacing;
   permission_box_->SetX(x);
   permission_box_->SetY(y);
 
@@ -281,7 +281,7 @@ void InstallDialogContent2::Layout() {
 
   for (size_t i = 0; i < permissions_.size(); ++i) {
     if (i > 0) {
-      label_y += kRelatedControlVerticalSpacing;
+      label_y += views::kRelatedControlVerticalSpacing;
       permission_box_height += kPanelVertMargin;
     }
 
diff --git a/chrome/browser/ui/views/first_run_bubble.cc b/chrome/browser/ui/views/first_run_bubble.cc
index df041d3..802979a 100644
--- a/chrome/browser/ui/views/first_run_bubble.cc
+++ b/chrome/browser/ui/views/first_run_bubble.cc
@@ -175,7 +175,7 @@ void FirstRunBubbleView::Layout() {
                      pref_size.height());
 
   int next_v_space = label1_->y() + pref_size.height() +
-                     kRelatedControlSmallVerticalSpacing;
+                     views::kRelatedControlSmallVerticalSpacing;
 
   pref_size = label2_->GetPreferredSize();
   label2_->SetBounds(kBubblePadding, next_v_space,
@@ -332,7 +332,8 @@ void FirstRunOEMBubbleView::Layout() {
       pref_size.height());
 
   int next_v_space =
-      label1_->y() + pref_size.height() + kRelatedControlSmallVerticalSpacing;
+      label1_->y() + pref_size.height() +
+          views::kRelatedControlSmallVerticalSpacing;
 
   pref_size = label3_->GetPreferredSize();
   label3_->SetBounds(kOEMBubblePadding, next_v_space,
@@ -445,7 +446,7 @@ void FirstRunMinimalBubbleView::Layout() {
                      pref_size.height());
 
   int next_v_space = label1_->y() + pref_size.height() +
-                     kRelatedControlSmallVerticalSpacing;
+                     views::kRelatedControlSmallVerticalSpacing;
 
   pref_size = label2_->GetPreferredSize();
   label2_->SetBounds(kBubblePadding, next_v_space,
diff --git a/chrome/browser/ui/views/generic_info_view.cc b/chrome/browser/ui/views/generic_info_view.cc
index 1cb4426..644d960 100644
--- a/chrome/browser/ui/views/generic_info_view.cc
+++ b/chrome/browser/ui/views/generic_info_view.cc
@@ -72,7 +72,7 @@ void GenericInfoView::InitGenericInfoView() {
   views::ColumnSet* column_set = layout->AddColumnSet(kLayoutId);
   column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
@@ -81,7 +81,7 @@ void GenericInfoView::InitGenericInfoView() {
 
   for (int i = 0; i < number_of_rows_; ++i) {
     if (i)
-      layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
+      layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
     name_views_[i] = new views::Label;
     value_views_[i] = new views::Textfield;
     AddRow(kLayoutId, layout, name_views_[i], value_views_[i]);
diff --git a/chrome/browser/ui/views/importer_view.cc b/chrome/browser/ui/views/importer_view.cc
index 26ed58e..317456c 100644
--- a/chrome/browser/ui/views/importer_view.cc
+++ b/chrome/browser/ui/views/importer_view.cc
@@ -87,7 +87,7 @@ void ImporterView::SetupControl() {
   ColumnSet* column_set = layout->AddColumnSet(column_set_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
                         GridLayout::FIXED, 200, 0);
 
@@ -98,19 +98,19 @@ void ImporterView::SetupControl() {
   layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
   layout->StartRow(0, column_set_id);
   layout->AddView(import_items_label_, 3, 1);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, column_set_id);
   layout->AddView(favorites_checkbox_, 3, 1);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, column_set_id);
   layout->AddView(search_engines_checkbox_, 3, 1);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, column_set_id);
   layout->AddView(passwords_checkbox_, 3, 1);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, column_set_id);
   layout->AddView(history_checkbox_, 3, 1);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 }
 
 gfx::Size ImporterView::GetPreferredSize() {
diff --git a/chrome/browser/ui/views/importing_progress_view.cc b/chrome/browser/ui/views/importing_progress_view.cc
index 9906b27..fce962f 100644
--- a/chrome/browser/ui/views/importing_progress_view.cc
+++ b/chrome/browser/ui/views/importing_progress_view.cc
@@ -238,7 +238,7 @@ void ImportingProgressView::InitControlLayout() {
   if (bookmarks_import_) {
     column_set->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0,
                           GridLayout::FIXED, ps.width(), 0);
-    column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+    column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   }
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
@@ -248,7 +248,7 @@ void ImportingProgressView::InitControlLayout() {
       0, views::kUnrelatedControlLargeHorizontalSpacing);
   column_set->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0,
                         GridLayout::FIXED, ps.width(), 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(
@@ -264,31 +264,31 @@ void ImportingProgressView::InitControlLayout() {
     layout->StartRow(0, double_column_view_set_id);
     layout->AddView(state_history_.get());
     layout->AddView(label_history_.get());
-    layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+    layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   }
   if (items_ & importer::FAVORITES && !bookmarks_import_) {
     layout->StartRow(0, double_column_view_set_id);
     layout->AddView(state_bookmarks_.get());
     layout->AddView(label_bookmarks_.get());
-    layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+    layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   }
   if (items_ & importer::SEARCH_ENGINES) {
     layout->StartRow(0, double_column_view_set_id);
     layout->AddView(state_searches_.get());
     layout->AddView(label_searches_.get());
-    layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+    layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   }
   if (items_ & importer::PASSWORDS) {
     layout->StartRow(0, double_column_view_set_id);
     layout->AddView(state_passwords_.get());
     layout->AddView(label_passwords_.get());
-    layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+    layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   }
   if (items_ & importer::COOKIES) {
     layout->StartRow(0, double_column_view_set_id);
     layout->AddView(state_cookies_.get());
     layout->AddView(label_cookies_.get());
-    layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+    layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   }
 }
 
diff --git a/chrome/browser/ui/views/indexed_db_info_view.cc b/chrome/browser/ui/views/indexed_db_info_view.cc
index 9ba276d..34fd9eb6 100644
--- a/chrome/browser/ui/views/indexed_db_info_view.cc
+++ b/chrome/browser/ui/views/indexed_db_info_view.cc
@@ -101,18 +101,18 @@ void IndexedDBInfoView::Init() {
   views::ColumnSet* column_set = layout->AddColumnSet(three_column_layout_id);
   column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, three_column_layout_id);
   layout->AddView(origin_label);
   layout->AddView(origin_value_field_);
-  layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
   layout->StartRow(0, three_column_layout_id);
   layout->AddView(size_label);
   layout->AddView(size_value_field_);
-  layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
   layout->StartRow(0, three_column_layout_id);
   layout->AddView(last_modified_label);
   layout->AddView(last_modified_value_field_);
diff --git a/chrome/browser/ui/views/keyword_editor_view.cc b/chrome/browser/ui/views/keyword_editor_view.cc
index d4ea968..090e5a4 100644
--- a/chrome/browser/ui/views/keyword_editor_view.cc
+++ b/chrome/browser/ui/views/keyword_editor_view.cc
@@ -194,8 +194,8 @@ void KeywordEditorView::Init() {
 }
 
 void KeywordEditorView::InitLayoutManager() {
-  const int related_x = kRelatedControlHorizontalSpacing;
-  const int related_y = kRelatedControlVerticalSpacing;
+  const int related_x = views::kRelatedControlHorizontalSpacing;
+  const int related_y = views::kRelatedControlVerticalSpacing;
   const int unrelated_y = views::kUnrelatedControlVerticalSpacing;
 
   GridLayout* contents_layout = GridLayout::CreatePanel(this);
diff --git a/chrome/browser/ui/views/local_storage_info_view.cc b/chrome/browser/ui/views/local_storage_info_view.cc
index a658a5a..894d7c9 100644
--- a/chrome/browser/ui/views/local_storage_info_view.cc
+++ b/chrome/browser/ui/views/local_storage_info_view.cc
@@ -102,18 +102,18 @@ void LocalStorageInfoView::Init() {
   views::ColumnSet* column_set = layout->AddColumnSet(three_column_layout_id);
   column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, three_column_layout_id);
   layout->AddView(origin_label);
   layout->AddView(origin_value_field_);
-  layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
   layout->StartRow(0, three_column_layout_id);
   layout->AddView(size_label);
   layout->AddView(size_value_field_);
-  layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
   layout->StartRow(0, three_column_layout_id);
   layout->AddView(last_modified_label);
   layout->AddView(last_modified_value_field_);
diff --git a/chrome/browser/ui/views/local_storage_set_item_info_view.cc b/chrome/browser/ui/views/local_storage_set_item_info_view.cc
index 5266843..30bdbe5 100644
--- a/chrome/browser/ui/views/local_storage_set_item_info_view.cc
+++ b/chrome/browser/ui/views/local_storage_set_item_info_view.cc
@@ -97,18 +97,18 @@ void LocalStorageSetItemInfoView::Init() {
   views::ColumnSet* column_set = layout->AddColumnSet(three_column_layout_id);
   column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, three_column_layout_id);
   layout->AddView(host_label);
   layout->AddView(host_value_field_);
-  layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
   layout->StartRow(0, three_column_layout_id);
   layout->AddView(key_label);
   layout->AddView(key_value_field_);
-  layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
   layout->StartRow(0, three_column_layout_id);
   layout->AddView(value_label);
   layout->AddView(value_value_field_);
diff --git a/chrome/browser/ui/views/login_view.cc b/chrome/browser/ui/views/login_view.cc
index e979adc..a898943 100644
--- a/chrome/browser/ui/views/login_view.cc
+++ b/chrome/browser/ui/views/login_view.cc
@@ -60,7 +60,7 @@ LoginView::LoginView(const std::wstring& explanation,
   column_set->AddPaddingColumn(0, kTextfieldStackHorizontalSpacing);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, kTextfieldStackHorizontalSpacing);
@@ -74,7 +74,7 @@ LoginView::LoginView(const std::wstring& explanation,
   layout->AddView(username_label_);
   layout->AddView(username_field_);
 
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, labels_column_set_id);
   layout->AddView(password_label_);
diff --git a/chrome/browser/ui/views/options/advanced_contents_view.cc b/chrome/browser/ui/views/options/advanced_contents_view.cc
index 35cc79b..e67c161 100644
--- a/chrome/browser/ui/views/options/advanced_contents_view.cc
+++ b/chrome/browser/ui/views/options/advanced_contents_view.cc
@@ -301,7 +301,7 @@ void AdvancedSection::AddDependentTwoColumnSet(views::GridLayout* layout,
   column_set->AddPaddingColumn(0, views::Checkbox::GetTextIndent());
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, views::kUnrelatedControlHorizontalSpacing);
@@ -311,7 +311,7 @@ void AdvancedSection::AddTwoColumnSet(views::GridLayout* layout, int id) {
   ColumnSet* column_set = layout->AddColumnSet(id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
 }
@@ -352,7 +352,7 @@ void AdvancedSection::AddLabeledTwoColumnRow(views::GridLayout* layout,
                                              bool related_follows) {
   label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   AddTwoColumnRow(layout, label, control, control_stretches, id,
-      related_follows ? kRelatedControlVerticalSpacing
+      related_follows ? views::kRelatedControlVerticalSpacing
                       : views::kUnrelatedControlVerticalSpacing);
 }
 
@@ -385,7 +385,7 @@ void AdvancedSection::AddLeadingControl(views::GridLayout* layout,
 void AdvancedSection::AddSpacing(views::GridLayout* layout,
                                  bool related_follows) {
   layout->AddPaddingRow(
-      0, related_follows ? kRelatedControlVerticalSpacing
+      0, related_follows ? views::kRelatedControlVerticalSpacing
                          : views::kUnrelatedControlVerticalSpacing);
 }
 
@@ -410,7 +410,7 @@ void AdvancedSection::InitControlLayout() {
 
   layout->StartRow(0, single_column_layout_id);
   layout->AddView(title_label_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, inset_column_layout_id);
   layout->AddView(contents_);
 }
@@ -1180,7 +1180,7 @@ void DownloadSection::InitControlLayout() {
   ColumnSet* column_set = layout->AddColumnSet(double_column_view_set_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, views::kUnrelatedControlHorizontalSpacing);
@@ -1419,7 +1419,7 @@ void CloudPrintProxySection::InitControlLayout() {
 
   // The enable / disable button and manage button.
   AddTwoColumnRow(layout, enable_disable_button_, manage_printer_button_, false,
-                  control_view_set_id, kRelatedControlVerticalSpacing);
+                  control_view_set_id, views::kRelatedControlVerticalSpacing);
 
   // Attach the preferences so we can flip things appropriately.
   cloud_print_proxy_email_.Init(prefs::kCloudPrintEmail,
diff --git a/chrome/browser/ui/views/options/advanced_page_view.cc b/chrome/browser/ui/views/options/advanced_page_view.cc
index f947e23..907caa7 100644
--- a/chrome/browser/ui/views/options/advanced_page_view.cc
+++ b/chrome/browser/ui/views/options/advanced_page_view.cc
@@ -142,7 +142,7 @@ void AdvancedPageView::InitControlLayout() {
 
   layout->StartRow(1, single_column_view_set_id);
   layout->AddView(advanced_scroll_view_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(reset_to_default_button_, 1, 1,
diff --git a/chrome/browser/ui/views/options/content_filter_page_view.cc b/chrome/browser/ui/views/options/content_filter_page_view.cc
index 738fa7b..265bd63 100644
--- a/chrome/browser/ui/views/options/content_filter_page_view.cc
+++ b/chrome/browser/ui/views/options/content_filter_page_view.cc
@@ -50,10 +50,10 @@ void ContentFilterPageView::InitControlLayout() {
 
   const int single_column_set_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(single_column_set_id);
-  column_set->AddPaddingColumn(0, kRelatedControlVerticalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlVerticalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   static const int kTitleIDs[] = {
     IDS_MODIFY_COOKIE_STORING_LABEL,
@@ -73,7 +73,7 @@ void ContentFilterPageView::InitControlLayout() {
 
   layout->StartRow(0, single_column_set_id);
   layout->AddView(title_label);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   static const int kAllowIDs[] = {
     IDS_COOKIES_ALLOW_RADIO,
@@ -94,7 +94,7 @@ void ContentFilterPageView::InitControlLayout() {
   allow_radio_->SetMultiLine(true);
   layout->StartRow(0, single_column_set_id);
   layout->AddView(allow_radio_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   static const int kAskIDs[] = {
     IDS_COOKIES_ASK_EVERY_TIME_RADIO,
@@ -121,7 +121,7 @@ void ContentFilterPageView::InitControlLayout() {
       ask_radio_->SetMultiLine(true);
       layout->StartRow(0, single_column_set_id);
       layout->AddView(ask_radio_);
-      layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+      layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
     }
   }
 
@@ -143,7 +143,7 @@ void ContentFilterPageView::InitControlLayout() {
   block_radio_->SetMultiLine(true);
   layout->StartRow(0, single_column_set_id);
   layout->AddView(block_radio_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   exceptions_button_ = new views::NativeButton(this,
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_COOKIES_EXCEPTIONS_BUTTON)));
diff --git a/chrome/browser/ui/views/options/content_page_view.cc b/chrome/browser/ui/views/options/content_page_view.cc
index 13eac36..19ace33 100644
--- a/chrome/browser/ui/views/options/content_page_view.cc
+++ b/chrome/browser/ui/views/options/content_page_view.cc
@@ -193,28 +193,28 @@ void ContentPageView::InitControlLayout() {
     layout->StartRow(0, single_column_view_set_id);
     InitSyncGroup();
     layout->AddView(sync_group_);
-    layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+    layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   }
 
   layout->StartRow(0, single_column_view_set_id);
   InitPasswordSavingGroup();
   layout->AddView(passwords_group_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, single_column_view_set_id);
   InitFormAutofillGroup();
   layout->AddView(form_autofill_group_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, single_column_view_set_id);
   InitBrowsingDataGroup();
   layout->AddView(browsing_data_group_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, single_column_view_set_id);
   InitThemesGroup();
   layout->AddView(themes_group_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Init member prefs so we can update the controls if prefs change.
   ask_to_save_passwords_.Init(prefs::kPasswordManagerEnabled,
@@ -306,7 +306,7 @@ void ContentPageView::InitPasswordSavingGroup() {
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(passwords_asktosave_radio_, 1, 1,
                   GridLayout::FILL, GridLayout::LEADING);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(passwords_neversave_radio_, 1, 1,
                   GridLayout::FILL, GridLayout::LEADING);
@@ -369,7 +369,7 @@ void ContentPageView::InitThemesGroup() {
   ColumnSet* double_col_set = layout->AddColumnSet(double_column_view_set_id);
   double_col_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                             GridLayout::USE_PREF, 0, 0);
-  double_col_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  double_col_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   double_col_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                             GridLayout::USE_PREF, 0, 0);
 
@@ -442,7 +442,7 @@ void ContentPageView::InitSyncGroup() {
   ColumnSet* column_set = layout->AddColumnSet(single_column_view_set_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
 
@@ -451,11 +451,11 @@ void ContentPageView::InitSyncGroup() {
                   GridLayout::FILL, GridLayout::LEADING);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(sync_action_link_, 3, 1);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(sync_start_stop_button_);
   layout->AddView(sync_customize_button_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(privacy_dashboard_link_, 3, 1);
 
diff --git a/chrome/browser/ui/views/options/cookie_filter_page_view.cc b/chrome/browser/ui/views/options/cookie_filter_page_view.cc
index db59a5d..ec44bdf 100644
--- a/chrome/browser/ui/views/options/cookie_filter_page_view.cc
+++ b/chrome/browser/ui/views/options/cookie_filter_page_view.cc
@@ -48,7 +48,7 @@ void CookieFilterPageView::InitControlLayout() {
 
   layout->StartRow(0, single_column_set_id);
   layout->AddView(block_3rdparty_check_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Now that this has been added to the view hierarchy, it's safe to call
   // SetChecked() on it.
@@ -62,7 +62,7 @@ void CookieFilterPageView::InitControlLayout() {
 
   layout->StartRow(0, single_column_set_id);
   layout->AddView(clear_on_close_check_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   show_cookies_button_ = new views::NativeButton(this,
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_COOKIES_SHOW_COOKIES_BUTTON)));
@@ -70,7 +70,7 @@ void CookieFilterPageView::InitControlLayout() {
   layout->StartRow(0, single_column_set_id);
   layout->AddView(show_cookies_button_, 1, 1, GridLayout::LEADING,
                   GridLayout::FILL);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   views::Link* flash_settings_link = new views::Link(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_FLASH_STORAGE_SETTINGS)));
diff --git a/chrome/browser/ui/views/options/cookies_view.cc b/chrome/browser/ui/views/options/cookies_view.cc
index 5b9c9e3..24c8ccc 100644
--- a/chrome/browser/ui/views/options/cookies_view.cc
+++ b/chrome/browser/ui/views/options/cookies_view.cc
@@ -185,7 +185,7 @@ void CookiesView::Layout() {
 
   ps = remove_all_button_->GetPreferredSize();
   int remove_all_x = remove_button_->x() + remove_button_->width() +
-      kRelatedControlHorizontalSpacing;
+      views::kRelatedControlHorizontalSpacing;
   remove_all_button_->SetBounds(remove_all_x, y_buttons, ps.width(),
                                 ps.height());
 
@@ -327,10 +327,10 @@ void CookiesView::Init() {
   ColumnSet* column_set = layout->AddColumnSet(five_column_layout_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 0,
                         GridLayout::USE_PREF, 0, 0);
 
@@ -348,7 +348,7 @@ void CookiesView::Init() {
   layout->StartRow(0, single_column_layout_id);
   layout->AddView(description_label_);
 
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(1, single_column_layout_id);
   cookies_tree_->set_lines_at_root(true);
   cookies_tree_->set_auto_expand_children(true);
@@ -356,7 +356,7 @@ void CookiesView::Init() {
 
   cookies_tree_->SetController(this);
 
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_layout_id);
   layout->AddView(info_panel_);
 
diff --git a/chrome/browser/ui/views/options/exception_editor_view.cc b/chrome/browser/ui/views/options/exception_editor_view.cc
index fde7b0b..c4404d3 100644
--- a/chrome/browser/ui/views/options/exception_editor_view.cc
+++ b/chrome/browser/ui/views/options/exception_editor_view.cc
@@ -130,10 +130,10 @@ void ExceptionEditorView::Init() {
   views::ColumnSet* column_set = layout->AddColumnSet(1);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::CENTER, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
 
@@ -143,12 +143,12 @@ void ExceptionEditorView::Init() {
   layout->AddView(pattern_tf_);
   layout->AddView(pattern_iv_);
 
-  layout->StartRowWithPadding(0, 1, 0, kRelatedControlVerticalSpacing);
+  layout->StartRowWithPadding(0, 1, 0, views::kRelatedControlVerticalSpacing);
   layout->AddView(CreateLabel(IDS_EXCEPTION_EDITOR_ACTION_TITLE));
   layout->AddView(action_cb_);
 
   if (allow_off_the_record_) {
-    layout->StartRowWithPadding(0, 1, 0, kRelatedControlVerticalSpacing);
+    layout->StartRowWithPadding(0, 1, 0, views::kRelatedControlVerticalSpacing);
     layout->AddView(incognito_cb_, 3, 1, GridLayout::FILL, GridLayout::FILL);
   }
 }
diff --git a/chrome/browser/ui/views/options/exceptions_page_view.cc b/chrome/browser/ui/views/options/exceptions_page_view.cc
index 8d9395e..ab96ed8 100644
--- a/chrome/browser/ui/views/options/exceptions_page_view.cc
+++ b/chrome/browser/ui/views/options/exceptions_page_view.cc
@@ -138,7 +138,7 @@ void ExceptionsPageView::InitControlLayout() {
   ColumnSet* column_set = layout->AddColumnSet(top_column_set_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
 
@@ -148,11 +148,11 @@ void ExceptionsPageView::InitControlLayout() {
                   GridLayout::FILL);
   layout->AddView(&remove_button_);
   layout->StartRowWithPadding(0, top_column_set_id, 0,
-                              kRelatedControlVerticalSpacing);
+                              views::kRelatedControlVerticalSpacing);
   layout->SkipColumns(1);
   layout->AddView(&remove_all_button_);
   layout->StartRowWithPadding(0, top_column_set_id, 0,
-                              kRelatedControlVerticalSpacing);
+                              views::kRelatedControlVerticalSpacing);
 
   layout->SkipColumns(1);
   layout->AddView(&show_button_);
diff --git a/chrome/browser/ui/views/options/exceptions_view.cc b/chrome/browser/ui/views/options/exceptions_view.cc
index 426e1c2..67ff3b6 100644
--- a/chrome/browser/ui/views/options/exceptions_view.cc
+++ b/chrome/browser/ui/views/options/exceptions_view.cc
@@ -91,7 +91,7 @@ void ExceptionsView::Layout() {
     gfx::Size pref = buttons[i]->GetPreferredSize();
     buttons[i]->SetBounds(x, max_y - pref.height(), pref.width(),
                           pref.height());
-    x += pref.width() + kRelatedControlHorizontalSpacing;
+    x += pref.width() + views::kRelatedControlHorizontalSpacing;
   }
 
   // Lay out the rest of this view.
@@ -208,14 +208,14 @@ void ExceptionsView::Init() {
 
   const int single_column_layout_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(single_column_layout_id);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(1, single_column_layout_id);
   layout->AddView(table_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   if (allow_off_the_record_) {
     views::Label* label = new views::Label(
@@ -223,7 +223,7 @@ void ExceptionsView::Init() {
     label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     layout->StartRow(0, single_column_layout_id);
     layout->AddView(label, 1, 1, GridLayout::LEADING, GridLayout::CENTER);
-    layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+    layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   }
 
   UpdateButtonState();
diff --git a/chrome/browser/ui/views/options/fonts_page_view.cc b/chrome/browser/ui/views/options/fonts_page_view.cc
index fb948833..283cab2 100644
--- a/chrome/browser/ui/views/options/fonts_page_view.cc
+++ b/chrome/browser/ui/views/options/fonts_page_view.cc
@@ -273,7 +273,7 @@ void FontsPageView::InitControlLayout() {
   fonts_group_title_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(fonts_group_title_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
   InitFontLayout();
   layout->AddView(fonts_contents_);
@@ -287,7 +287,7 @@ void FontsPageView::InitControlLayout() {
   encoding_group_title_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(encoding_group_title_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
   InitEncodingLayout();
   layout->AddView(encoding_contents_);
@@ -364,10 +364,10 @@ void FontsPageView::InitFontLayout() {
 
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
 
@@ -377,7 +377,7 @@ void FontsPageView::InitFontLayout() {
   layout->AddView(serif_font_display_view_, 1, 1,
                   GridLayout::FILL, GridLayout::CENTER);
   layout->AddView(serif_font_change_page_button_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Sans serif font controls.
   layout->StartRow(0, triple_column_view_set_id);
@@ -385,7 +385,7 @@ void FontsPageView::InitFontLayout() {
   layout->AddView(sans_serif_font_display_view_, 1, 1,
                   GridLayout::FILL, GridLayout::CENTER);
   layout->AddView(sans_serif_font_change_page_button_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Fixed-width font controls.
   layout->StartRow(0, triple_column_view_set_id);
@@ -393,7 +393,7 @@ void FontsPageView::InitFontLayout() {
   layout->AddView(fixed_width_font_display_view_, 1, 1,
                   GridLayout::FILL, GridLayout::CENTER);
   layout->AddView(fixed_width_font_change_page_button_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 }
 
 void FontsPageView::InitEncodingLayout() {
@@ -423,7 +423,7 @@ void FontsPageView::InitEncodingLayout() {
   ColumnSet* column_set = layout->AddColumnSet(double_column_view_set_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
diff --git a/chrome/browser/ui/views/options/general_page_view.cc b/chrome/browser/ui/views/options/general_page_view.cc
index cd98db4..b78f51a 100644
--- a/chrome/browser/ui/views/options/general_page_view.cc
+++ b/chrome/browser/ui/views/options/general_page_view.cc
@@ -354,23 +354,23 @@ void GeneralPageView::InitControlLayout() {
   layout->StartRow(0, single_column_view_set_id);
   InitStartupGroup();
   layout->AddView(startup_group_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, single_column_view_set_id);
   InitHomepageGroup();
   layout->AddView(homepage_group_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, single_column_view_set_id);
   InitDefaultSearchGroup();
   layout->AddView(default_search_group_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
 #if !defined(OS_CHROMEOS)
   layout->StartRow(0, single_column_view_set_id);
   InitDefaultBrowserGroup();
   layout->AddView(default_browser_group_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 #endif
 
   // Register pref observers that update the controls when a pref changes.
@@ -562,20 +562,20 @@ void GeneralPageView::InitStartupGroup() {
   column_set = layout->AddColumnSet(double_column_view_set_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 0,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(startup_homepage_radio_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(startup_last_session_radio_, 1, 1,
                   GridLayout::FILL, GridLayout::LEADING);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(startup_custom_radio_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, double_column_view_set_id);
   layout->AddView(startup_custom_pages_table_, 1, 1,
@@ -591,11 +591,11 @@ void GeneralPageView::InitStartupGroup() {
   button_stack_layout->StartRow(0, single_column_view_set_id);
   button_stack_layout->AddView(startup_add_custom_page_button_,
                                1, 1, GridLayout::FILL, GridLayout::CENTER);
-  button_stack_layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  button_stack_layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   button_stack_layout->StartRow(0, single_column_view_set_id);
   button_stack_layout->AddView(startup_remove_custom_page_button_,
                                1, 1, GridLayout::FILL, GridLayout::CENTER);
-  button_stack_layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  button_stack_layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   button_stack_layout->StartRow(0, single_column_view_set_id);
   button_stack_layout->AddView(startup_use_current_page_button_,
                                1, 1, GridLayout::FILL, GridLayout::CENTER);
@@ -642,18 +642,18 @@ void GeneralPageView::InitHomepageGroup() {
   column_set = layout->AddColumnSet(double_column_view_set_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(homepage_use_newtab_radio_, 1, 1,
                   GridLayout::FILL, GridLayout::LEADING);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, double_column_view_set_id);
   layout->AddView(homepage_use_url_radio_);
   layout->AddView(homepage_use_url_textfield_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(homepage_show_home_button_checkbox_, 1, 1,
                   GridLayout::FILL, GridLayout::LEADING);
@@ -698,7 +698,7 @@ void GeneralPageView::InitDefaultSearchGroup() {
   ColumnSet* column_set = layout->AddColumnSet(double_column_view_set_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
 
@@ -713,7 +713,7 @@ void GeneralPageView::InitDefaultSearchGroup() {
   column_set->AddPaddingColumn(0, views::Checkbox::GetTextIndent() + 3);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
 
@@ -764,7 +764,7 @@ void GeneralPageView::InitDefaultBrowserGroup() {
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(default_browser_status_label_, 1, 1,
                   GridLayout::FILL, GridLayout::LEADING);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(default_browser_use_as_default_button_);
 
diff --git a/chrome/browser/ui/views/options/languages_page_view.cc b/chrome/browser/ui/views/options/languages_page_view.cc
index 280afaf..c493588 100644
--- a/chrome/browser/ui/views/options/languages_page_view.cc
+++ b/chrome/browser/ui/views/options/languages_page_view.cc
@@ -282,7 +282,7 @@ void LanguagesPageView::InitControlLayout() {
       views::Label::ALIGN_LEFT);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(languages_instructions_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Add two columns - for table, and for button stack.
   std::vector<TableColumn> columns;
@@ -297,7 +297,7 @@ void LanguagesPageView::InitControlLayout() {
   column_set = layout->AddColumnSet(double_column_view_set_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 0,
                         GridLayout::USE_PREF, 0, 0);
 
@@ -317,15 +317,15 @@ void LanguagesPageView::InitControlLayout() {
   button_stack_layout->StartRow(0, single_column_view_set_id);
   button_stack_layout->AddView(add_button_, 1, 1, GridLayout::FILL,
                                GridLayout::CENTER);
-  button_stack_layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  button_stack_layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   button_stack_layout->StartRow(0, single_column_view_set_id);
   button_stack_layout->AddView(remove_button_, 1, 1, GridLayout::FILL,
                                GridLayout::CENTER);
-  button_stack_layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  button_stack_layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   button_stack_layout->StartRow(0, single_column_view_set_id);
   button_stack_layout->AddView(move_up_button_, 1, 1, GridLayout::FILL,
                                GridLayout::CENTER);
-  button_stack_layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  button_stack_layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   button_stack_layout->StartRow(0, single_column_view_set_id);
   button_stack_layout->AddView(move_down_button_, 1, 1, GridLayout::FILL,
                                GridLayout::CENTER);
@@ -371,17 +371,17 @@ void LanguagesPageView::InitControlLayout() {
   // SpellCheck language settings.
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(enable_spellchecking_checkbox_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   if (command_line.HasSwitch(switches::kExperimentalSpellcheckerFeatures)) {
     layout->StartRow(0, single_column_view_set_id);
     layout->AddView(enable_autospellcorrect_checkbox_);
-    layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+    layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   }
   const int double_column_view_set_2_id = 2;
   column_set = layout->AddColumnSet(double_column_view_set_2_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
@@ -393,12 +393,12 @@ void LanguagesPageView::InitControlLayout() {
   layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(language_info_label_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, double_column_view_set_2_id);
   layout->AddView(ui_language_label_);
   layout->AddView(change_ui_language_combobox_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Init member prefs so we can update the controls if prefs change.
   app_locale_.Init(prefs::kApplicationLocale,
diff --git a/chrome/browser/ui/views/options/managed_prefs_banner_view.cc b/chrome/browser/ui/views/options/managed_prefs_banner_view.cc
index faff41f..02ef429 100644
--- a/chrome/browser/ui/views/options/managed_prefs_banner_view.cc
+++ b/chrome/browser/ui/views/options/managed_prefs_banner_view.cc
@@ -39,7 +39,7 @@ void ManagedPrefsBannerView::Init() {
       new views::BoxLayout(views::BoxLayout::kHorizontal,
                            kPrefsBannerPadding,
                            kPrefsBannerPadding,
-                           kRelatedControlSmallHorizontalSpacing));
+                           views::kRelatedControlSmallHorizontalSpacing));
   content_->AddChildView(warning_image_);
   content_->AddChildView(label_);
   OnUpdateVisibility();
@@ -51,12 +51,13 @@ gfx::Size ManagedPrefsBannerView::GetPreferredSize() {
 
   // Add space below the banner.
   gfx::Size size(content_->GetPreferredSize());
-  size.Enlarge(0, kRelatedControlVerticalSpacing);
+  size.Enlarge(0, views::kRelatedControlVerticalSpacing);
   return size;
 }
 
 void ManagedPrefsBannerView::Layout() {
-  content_->SetBounds(0, 0, width(), height() - kRelatedControlVerticalSpacing);
+  content_->SetBounds(
+      0, 0, width(), height() - views::kRelatedControlVerticalSpacing);
 }
 
 void ManagedPrefsBannerView::ViewHierarchyChanged(bool is_add,
diff --git a/chrome/browser/ui/views/options/options_group_view.cc b/chrome/browser/ui/views/options/options_group_view.cc
index 2b8ed80..0d4a64d 100644
--- a/chrome/browser/ui/views/options/options_group_view.cc
+++ b/chrome/browser/ui/views/options/options_group_view.cc
@@ -113,19 +113,19 @@ void OptionsGroupView::Init() {
 
   const int two_column_layout_id = 0;
   ColumnSet* column_set = layout->AddColumnSet(two_column_layout_id);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::LEADING, 0,
                         GridLayout::FIXED, left_column_width, 0);
   column_set->AddPaddingColumn(0, kOptionsGroupViewColumnSpacing);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::LEADING, 1,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
 
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(0, two_column_layout_id);
   layout->AddView(title_label_, 1, 1, GridLayout::FILL, GridLayout::LEADING);
   layout->AddView(contents_, 1, 3, GridLayout::FILL, GridLayout::FILL);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   layout->StartRow(1, two_column_layout_id);
   layout->AddView(description_label_, 1, 1,
                   GridLayout::FILL, GridLayout::LEADING);
diff --git a/chrome/browser/ui/views/options/passwords_page_view.cc b/chrome/browser/ui/views/options/passwords_page_view.cc
index 11a16d1..705c4d1 100644
--- a/chrome/browser/ui/views/options/passwords_page_view.cc
+++ b/chrome/browser/ui/views/options/passwords_page_view.cc
@@ -284,7 +284,7 @@ void PasswordsPageView::InitControlLayout() {
   ColumnSet* column_set = layout->AddColumnSet(top_column_set_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
 
@@ -294,15 +294,15 @@ void PasswordsPageView::InitControlLayout() {
                   GridLayout::FILL);
   layout->AddView(&remove_button_);
   layout->StartRowWithPadding(0, top_column_set_id, 0,
-                              kRelatedControlVerticalSpacing);
+                              views::kRelatedControlVerticalSpacing);
   layout->SkipColumns(1);
   layout->AddView(&remove_all_button_);
   layout->StartRowWithPadding(0, top_column_set_id, 0,
-                              kRelatedControlVerticalSpacing);
+                              views::kRelatedControlVerticalSpacing);
   layout->SkipColumns(1);
   layout->AddView(&show_button_);
   layout->StartRowWithPadding(0, top_column_set_id, 0,
-                              kRelatedControlVerticalSpacing);
+                              views::kRelatedControlVerticalSpacing);
   layout->SkipColumns(1);
   layout->AddView(&password_label_);
   layout->AddPaddingRow(1, 0);
diff --git a/chrome/browser/ui/views/options/simple_content_exceptions_view.cc b/chrome/browser/ui/views/options/simple_content_exceptions_view.cc
index b53bf4a..5dc1d3e 100644
--- a/chrome/browser/ui/views/options/simple_content_exceptions_view.cc
+++ b/chrome/browser/ui/views/options/simple_content_exceptions_view.cc
@@ -77,7 +77,7 @@ void SimpleContentExceptionsView::Layout() {
     gfx::Size pref = buttons[i]->GetPreferredSize();
     buttons[i]->SetBounds(x, max_y - pref.height(), pref.width(),
                           pref.height());
-    x += pref.width() + kRelatedControlHorizontalSpacing;
+    x += pref.width() + views::kRelatedControlHorizontalSpacing;
   }
 
   // Lay out the rest of this view.
@@ -153,14 +153,14 @@ void SimpleContentExceptionsView::Init() {
 
   const int single_column_layout_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(single_column_layout_id);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(1, single_column_layout_id);
   layout->AddView(table_);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   UpdateButtonState();
 }
diff --git a/chrome/browser/ui/views/uninstall_view.cc b/chrome/browser/ui/views/uninstall_view.cc
index ee82e24..c087b41 100644
--- a/chrome/browser/ui/views/uninstall_view.cc
+++ b/chrome/browser/ui/views/uninstall_view.cc
@@ -57,7 +57,7 @@ void UninstallView::SetupControls() {
   // The "delete profile" check box.
   ++column_set_id;
   column_set = layout->AddColumnSet(column_set_id);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
   layout->StartRow(0, column_set_id);
@@ -72,14 +72,14 @@ void UninstallView::SetupControls() {
     browsers_.reset(new BrowsersMap());
     ShellUtil::GetRegisteredBrowsers(dist, browsers_.get());
     if (!browsers_->empty()) {
-      layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+      layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
       ++column_set_id;
       column_set = layout->AddColumnSet(column_set_id);
-      column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+      column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
       column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                             GridLayout::USE_PREF, 0, 0);
-      column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+      column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
       column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                             GridLayout::USE_PREF, 0, 0);
       layout->StartRow(0, column_set_id);
@@ -93,7 +93,7 @@ void UninstallView::SetupControls() {
     }
   }
 
-  layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
 }
 
 bool UninstallView::Accept() {
diff --git a/chrome/browser/ui/views/url_picker.cc b/chrome/browser/ui/views/url_picker.cc
index 1bcfe92..7d6060b 100644
--- a/chrome/browser/ui/views/url_picker.cc
+++ b/chrome/browser/ui/views/url_picker.cc
@@ -75,7 +75,7 @@ UrlPicker::UrlPicker(UrlPickerDelegate* delegate,
   ColumnSet* column_set = layout->AddColumnSet(labels_column_set_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
 
@@ -104,12 +104,12 @@ UrlPicker::UrlPicker(UrlPickerDelegate* delegate,
       description_label->font().DeriveFont(0, gfx::Font::BOLD));
   layout->AddView(description_label);
 
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(1, single_column_view_set_id);
   layout->AddView(url_table_);
 
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   AddAccelerator(views::Accelerator(ui::VKEY_RETURN, false, false, false));
 }