views::Separator cleanup.

chrome/browser/ui/views/profiles/profile_chooser_view.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
 
 #include "base/macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 683 matching lines @@
     int available_width = width - 2 * views::kButtonHEdgeMarginNew;
     columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 0,
         views::GridLayout::FIXED, available_width, available_width);
     columns->AddPaddingColumn(1, views::kButtonHEdgeMarginNew);
     layout->AddColumnSet(1)->AddColumn(views::GridLayout::FILL,
         views::GridLayout::FILL, 0,views::GridLayout::FIXED, width, width);
 
     layout->StartRowWithPadding(1, 0, 0, kVerticalSpacing);
     layout->AddView(title_card);
     layout->StartRowWithPadding(1, 1, 0, kVerticalSpacing);
-    layout->AddView(new views::Separator(views::Separator::HORIZONTAL));
+    layout->AddView(new views::Separator());
 
     layout->StartRow(1, 1);
     layout->AddView(view);
 
     return titled_view;
   }
 
  private:
   void Layout() override {
     int back_button_width = back_button_->GetPreferredSize().width();
@@ skipping 572 matching lines @@
     layout->StartRow(1, 0);
     layout->AddView(tutorial_view);
   } else {
     tutorial_mode_ = profiles::TUTORIAL_MODE_NONE;
   }
 
   if (sync_error_view) {
     layout->StartRow(1, 0);
     layout->AddView(sync_error_view);
     layout->StartRow(0, 0);
-    layout->AddView(new views::Separator(views::Separator::HORIZONTAL));
+    layout->AddView(new views::Separator());
   }
 
   if (!current_profile_view) {
     // Guest windows don't have an active profile.
     current_profile_view = CreateGuestProfileView();
     option_buttons_view = CreateOptionsView(false, avatar_menu);
   }
 
   layout->StartRow(1, 0);
   layout->AddView(current_profile_view);
 
   if (!IsProfileChooser(view_mode_)) {
     DCHECK(current_profile_accounts);
     layout->StartRow(0, 0);
-    layout->AddView(new views::Separator(views::Separator::HORIZONTAL));
+    layout->AddView(new views::Separator());
     layout->StartRow(1, 0);
     layout->AddView(current_profile_accounts);
   }
 
   if (browser_->profile()->IsSupervised()) {
     if (!switches::IsMaterialDesignUserMenu()) {
       layout->StartRow(0, 0);
-      layout->AddView(new views::Separator(views::Separator::HORIZONTAL));
+      layout->AddView(new views::Separator());
     }
     layout->StartRow(1, 0);
     layout->AddView(CreateSupervisedUserDisclaimerView());
   }
 
   layout->StartRow(0, 0);
-  layout->AddView(new views::Separator(views::Separator::HORIZONTAL));
+  layout->AddView(new views::Separator());
 
   if (option_buttons_view) {
     layout->StartRow(0, 0);
     layout->AddView(option_buttons_view);
   }
 }
 
 void ProfileChooserView::PopulateMinimalProfileChooserView(
     views::GridLayout* layout,
     AvatarMenu* avatar_menu) {
@@ skipping 541 matching lines @@
     gfx::Image image = profiles::GetSizedAvatarIcon(
         item_icon, true, kSmallImageSide, kSmallImageSide);
 
     views::LabelButton* button = new BackgroundColorHoverButton(
         this,
         profiles::GetProfileSwitcherTextForItem(item),
         *image.ToImageSkia());
     open_other_profile_indexes_map_[button] = index;
 
     layout->StartRow(1, 0);
-    layout->AddView(new views::Separator(views::Separator::HORIZONTAL));
+    layout->AddView(new views::Separator());
     layout->StartRow(1, 0);
     layout->AddView(button);
   }
 
   return view;
 }
 
 views::View* ProfileChooserView::CreateOptionsView(bool display_lock,
                                                    AvatarMenu* avatar_menu) {
   views::View* view = new views::View();
@@ skipping 54 matching lines @@
   }
   users_button_ = new BackgroundColorHoverButton(
       this, text, gfx::CreateVectorIcon(settings_icon, kIconSize,
                                         gfx::kChromeIconGrey));
 
   layout->StartRow(1, 0);
   layout->AddView(users_button_);
 
   if (!switches::IsMaterialDesignUserMenu() && ShouldShowGoIncognito()) {
     layout->StartRow(1, 0);
-    layout->AddView(new views::Separator(views::Separator::HORIZONTAL));
+    layout->AddView(new views::Separator());
 
     ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
     go_incognito_button_ = new BackgroundColorHoverButton(
         this,
         l10n_util::GetStringUTF16(IDS_PROFILES_GO_INCOGNITO_BUTTON),
         *rb->GetImageSkiaNamed(IDR_ICON_PROFILES_MENU_INCOGNITO));
     layout->StartRow(1, 0);
     layout->AddView(go_incognito_button_);
   }
 
   if (display_lock) {
     if (!switches::IsMaterialDesignUserMenu()) {
       layout->StartRow(1, 0);
-      layout->AddView(new views::Separator(views::Separator::HORIZONTAL));
+      layout->AddView(new views::Separator());
     }
 
     lock_button_ = new BackgroundColorHoverButton(
         this, l10n_util::GetStringUTF16(IDS_PROFILES_PROFILE_SIGNOUT_BUTTON),
         gfx::CreateVectorIcon(gfx::VectorIconId::LOCK, kIconSize,
                               gfx::kChromeIconGrey));
     layout->StartRow(1, 0);
     layout->AddView(lock_button_);
   } else if (switches::IsMaterialDesignUserMenu() && !is_guest) {
     int num_browsers = 0;
@@ skipping 336 matching lines @@
   views::Label* content_label = new views::Label(
       l10n_util::GetStringFUTF16(
           IDS_PROFILES_NOT_YOU_CONTENT_TEXT, avatar_item.name));
   content_label->SetMultiLine(true);
   content_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   content_label->SetFontList(small_font_list);
   layout->AddView(content_label);
 
   // Adds "Add person" button.
   layout->StartRowWithPadding(1, 0, 0, views::kUnrelatedControlVerticalSpacing);
-  layout->AddView(new views::Separator(views::Separator::HORIZONTAL));
+  layout->AddView(new views::Separator());
 
   const int kIconSize = 24;
   add_person_button_ = new BackgroundColorHoverButton(
       this, l10n_util::GetStringUTF16(IDS_PROFILES_ADD_PERSON_BUTTON),
       gfx::CreateVectorIcon(gfx::VectorIconId::ACCOUNT_BOX, kIconSize,
                             gfx::kChromeIconGrey));
   layout->StartRow(1, 0);
   layout->AddView(add_person_button_);
 
   // Adds "Disconnect your Google Account" button.
   layout->StartRow(1, 0);
-  layout->AddView(new views::Separator(views::Separator::HORIZONTAL));
+  layout->AddView(new views::Separator());
 
   disconnect_button_ = new BackgroundColorHoverButton(
       this, l10n_util::GetStringUTF16(IDS_PROFILES_DISCONNECT_BUTTON),
       gfx::CreateVectorIcon(gfx::VectorIconId::REMOVE_BOX, kIconSize,
                             gfx::kChromeIconGrey));
   layout->StartRow(1, 0);
   layout->AddView(disconnect_button_);
 
   TitleCard* title_card = new TitleCard(
       l10n_util::GetStringFUTF16(IDS_PROFILES_NOT_YOU, avatar_item.name),
       this, &switch_user_cancel_button_);
   return TitleCard::AddPaddedTitleCard(view, title_card,
       kFixedSwitchUserViewWidth);
 }
 
 bool ProfileChooserView::ShouldShowGoIncognito() const {
   bool incognito_available =
       IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) !=
           IncognitoModePrefs::DISABLED;
   return incognito_available && !browser_->profile()->IsGuestSession();
 }
 
 void ProfileChooserView::PostActionPerformed(
     ProfileMetrics::ProfileDesktopMenu action_performed) {
   ProfileMetrics::LogProfileDesktopMenu(action_performed, gaia_service_type_);
   gaia_service_type_ = signin::GAIA_SERVICE_TYPE_NONE;
 }