Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5726)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/profiles/profile_chooser_view.cc

Issue 2902873002: Views/Harmony Remove references to ui/views/layout/layout_constants.h (Closed)
Patch Set: Fix patch failures. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc ('k') | chrome/browser/ui/views/translate/translate_bubble_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/profiles/profile_chooser_view.cc
diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view.cc b/chrome/browser/ui/views/profiles/profile_chooser_view.cc
index 69700e5b90fbe35b8050342eb47c64c55b0367c1..c3c966152023bacb549159f037a20613a16c9a9d 100644
--- a/chrome/browser/ui/views/profiles/profile_chooser_view.cc
+++ b/chrome/browser/ui/views/profiles/profile_chooser_view.cc
@@ -34,6 +34,7 @@
#include "chrome/browser/ui/profile_chooser_constants.h"
#include "chrome/browser/ui/singleton_tabs.h"
#include "chrome/browser/ui/user_manager.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
#include "chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h"
#include "chrome/browser/ui/views/profiles/user_manager_view.h"
#include "chrome/browser/ui/webui/signin/login_ui_service.h"
@@ -84,7 +85,6 @@
#include "ui/views/layout/box_layout.h"
#include "ui/views/layout/fill_layout.h"
#include "ui/views/layout/grid_layout.h"
-#include "ui/views/layout/layout_constants.h"
#include "ui/views/widget/widget.h"
namespace {
@@ -193,7 +193,9 @@ class BackgroundColorHoverButton : public views::LabelButton {
const gfx::ImageSkia& icon)
: BackgroundColorHoverButton(profile_chooser_view, text) {
SetMinSize(gfx::Size(
- icon.width(), kButtonHeight + views::kRelatedControlVerticalSpacing));
+ icon.width(),
+ kButtonHeight + ChromeLayoutProvider::Get()->GetDistanceMetric(
+ views::DISTANCE_RELATED_CONTROL_VERTICAL)));
SetImage(STATE_NORMAL, icon);
}
@@ -335,7 +337,8 @@ class EditableProfilePhoto : public views::LabelButton {
SetBorder(views::NullBorder());
SetMinSize(gfx::Size(GetPreferredSize().width() + kBadgeSpacing,
GetPreferredSize().height() + kBadgeSpacing +
- views::kRelatedControlSmallVerticalSpacing));
+ ChromeLayoutProvider::Get()->GetDistanceMetric(
+ DISTANCE_RELATED_CONTROL_VERTICAL_SMALL)));
SetEnabled(false);
}
@@ -362,7 +365,8 @@ class EditableProfilePhoto : public views::LabelButton {
int badge_offset = kImageSide + kBadgeSpacing - kProfileBadgeSize;
gfx::Vector2d badge_offset_vector = gfx::Vector2d(
GetMirroredXWithWidthInView(badge_offset, kProfileBadgeSize),
- badge_offset + views::kRelatedControlSmallVerticalSpacing);
+ badge_offset + ChromeLayoutProvider::Get()->GetDistanceMetric(
+ DISTANCE_RELATED_CONTROL_VERTICAL_SMALL));
gfx::Point center_point = bounds.CenterPoint() + badge_offset_vector;
@@ -445,14 +449,17 @@ class TitleCard : public views::View {
views::GridLayout* layout = new views::GridLayout(titled_view);
titled_view->SetLayoutManager(layout);
+ ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
+ const int button_margin =
+ provider->GetDistanceMetric(DISTANCE_DIALOG_BUTTON_MARGIN);
// Column set 0 is a single column layout with horizontal padding at left
// and right, and column set 1 is a single column layout with no padding.
views::ColumnSet* columns = layout->AddColumnSet(0);
- columns->AddPaddingColumn(1, views::kButtonHEdgeMarginNew);
- int available_width = width - 2 * views::kButtonHEdgeMarginNew;
+ columns->AddPaddingColumn(1, button_margin);
+ int available_width = width - 2 * button_margin;
columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 0,
views::GridLayout::FIXED, available_width, available_width);
- columns->AddPaddingColumn(1, views::kButtonHEdgeMarginNew);
+ columns->AddPaddingColumn(1, button_margin);
layout->AddColumnSet(1)->AddColumn(views::GridLayout::FILL,
views::GridLayout::FILL, 0,views::GridLayout::FIXED, width, width);
@@ -471,7 +478,9 @@ class TitleCard : public views::View {
void Layout() override {
int back_button_width = back_button_->GetPreferredSize().width();
back_button_->SetBounds(0, 0, back_button_width, height());
- int label_padding = back_button_width + views::kButtonHEdgeMarginNew;
+ int label_padding =
+ back_button_width + ChromeLayoutProvider::Get()->GetDistanceMetric(
+ DISTANCE_DIALOG_BUTTON_MARGIN);
int label_width = width() - 2 * label_padding;
DCHECK_GT(label_width, 0);
title_label_->SetBounds(label_padding, 0, label_width, height());
@@ -1090,20 +1099,35 @@ views::View* ProfileChooserView::CreateTutorialView(
views::ImageButton** close_button) {
tutorial_mode_ = tutorial_mode;
+ // TODO(ananta)
+ // Use the dialog framework to create a dialog here instead of manually
+ // creating one.
+ ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
+ const int border_top =
+ provider->GetInsetsMetric(views::INSETS_DIALOG_TITLE).top();
+ const int border_bottom =
+ provider->GetInsetsMetric(views::INSETS_DIALOG_BUTTON).bottom();
+ const int button_margin =
+ provider->GetDistanceMetric(DISTANCE_DIALOG_BUTTON_MARGIN);
+ const int unrelated_control_horizontal =
+ provider->GetDistanceMetric(DISTANCE_UNRELATED_CONTROL_HORIZONTAL);
+ const int unrelated_control_vertical =
+ provider->GetDistanceMetric(DISTANCE_UNRELATED_CONTROL_VERTICAL);
+ const int related_control_vertical =
+ provider->GetDistanceMetric(DISTANCE_UNRELATED_CONTROL_VERTICAL);
+
views::View* view = new views::View();
view->set_background(views::Background::CreateSolidBackground(
profiles::kAvatarTutorialBackgroundColor));
- view->SetBorder(views::CreateEmptyBorder(
- views::kButtonVEdgeMarginNew, views::kButtonHEdgeMarginNew,
- views::kButtonVEdgeMarginNew, views::kButtonHEdgeMarginNew));
- views::GridLayout* layout = CreateSingleColumnLayout(
- view, kFixedMenuWidth - 2 * views::kButtonHEdgeMarginNew);
+ view->SetBorder(views::CreateEmptyBorder(border_top, button_margin,
+ border_bottom, button_margin));
+ views::GridLayout* layout =
+ CreateSingleColumnLayout(view, kFixedMenuWidth - 2 * button_margin);
// Creates a second column set for buttons and links.
views::ColumnSet* button_columns = layout->AddColumnSet(1);
button_columns->AddColumn(views::GridLayout::LEADING,
views::GridLayout::CENTER, 0, views::GridLayout::USE_PREF, 0, 0);
- button_columns->AddPaddingColumn(
- 1, views::kUnrelatedControlHorizontalSpacing);
+ button_columns->AddPaddingColumn(1, unrelated_control_horizontal);
button_columns->AddColumn(views::GridLayout::TRAILING,
views::GridLayout::CENTER, 0, views::GridLayout::USE_PREF, 0, 0);
@@ -1142,7 +1166,7 @@ views::View* ProfileChooserView::CreateTutorialView(
content_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
content_label->SetAutoColorReadabilityEnabled(false);
content_label->SetEnabledColor(profiles::kAvatarTutorialContentTextColor);
- layout->StartRowWithPadding(1, 0, 0, views::kRelatedControlVerticalSpacing);
+ layout->StartRowWithPadding(1, 0, 0, related_control_vertical);
layout->AddView(content_label);
// Adds links and buttons.
@@ -1165,19 +1189,16 @@ views::View* ProfileChooserView::CreateTutorialView(
if (stack_button) {
DCHECK(has_button);
- layout->StartRowWithPadding(
- 1, 0, 0, views::kUnrelatedControlVerticalSpacing);
+ layout->StartRowWithPadding(1, 0, 0, unrelated_control_vertical);
layout->AddView(*button);
if (has_link) {
- layout->StartRowWithPadding(
- 1, 0, 0, views::kRelatedControlVerticalSpacing);
+ layout->StartRowWithPadding(1, 0, 0, related_control_vertical);
(*link)->SetHorizontalAlignment(gfx::ALIGN_CENTER);
layout->AddView(*link);
}
} else {
DCHECK(has_link || has_button);
- layout->StartRowWithPadding(
- 1, 1, 0, views::kUnrelatedControlVerticalSpacing);
+ layout->StartRowWithPadding(1, 1, 0, unrelated_control_vertical);
if (has_link)
layout->AddView(*link);
else
@@ -1222,11 +1243,13 @@ views::View* ProfileChooserView::CreateSyncErrorViewIfNeeded() {
NOTREACHED();
}
+ ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
+
// Sets an overall horizontal layout.
views::View* view = new views::View();
views::BoxLayout* layout = new views::BoxLayout(
views::BoxLayout::kHorizontal, kMenuEdgeMargin, kMenuEdgeMargin,
- views::kUnrelatedControlHorizontalSpacing);
+ provider->GetDistanceMetric(DISTANCE_UNRELATED_CONTROL_HORIZONTAL));
layout->set_cross_axis_alignment(
views::BoxLayout::CROSS_AXIS_ALIGNMENT_START);
view->SetLayoutManager(layout);
@@ -1239,9 +1262,9 @@ views::View* ProfileChooserView::CreateSyncErrorViewIfNeeded() {
// Adds a vertical view to organize the error title, message, and button.
views::View* vertical_view = new views::View();
- views::BoxLayout* vertical_layout =
- new views::BoxLayout(views::BoxLayout::kVertical, 0, 0,
- views::kRelatedControlSmallVerticalSpacing);
+ views::BoxLayout* vertical_layout = new views::BoxLayout(
+ views::BoxLayout::kVertical, 0, 0,
+ provider->GetDistanceMetric(DISTANCE_RELATED_CONTROL_VERTICAL_SMALL));
vertical_layout->set_cross_axis_alignment(
views::BoxLayout::CROSS_AXIS_ALIGNMENT_START);
vertical_view->SetLayoutManager(vertical_layout);
@@ -1267,15 +1290,18 @@ views::View* ProfileChooserView::CreateSyncErrorViewIfNeeded() {
DCHECK(button_out);
// Adds a padding row between error title/content and the button.
auto* padding = new views::View;
- padding->set_preferred_size(
- gfx::Size(0, views::kRelatedControlVerticalSpacing));
+ padding->set_preferred_size(gfx::Size(
+ 0,
+ provider->GetDistanceMetric(views::DISTANCE_RELATED_CONTROL_VERTICAL)));
vertical_view->AddChildView(padding);
*button_out = views::MdTextButton::CreateSecondaryUiBlueButton(
this, l10n_util::GetStringUTF16(button_string_id));
vertical_view->AddChildView(*button_out);
view->SetBorder(views::CreateEmptyBorder(
- 0, 0, views::kRelatedControlSmallVerticalSpacing, 0));
+ 0, 0,
+ provider->GetDistanceMetric(DISTANCE_RELATED_CONTROL_VERTICAL_SMALL),
+ 0));
}
view->AddChildView(vertical_view);
@@ -1285,10 +1311,14 @@ views::View* ProfileChooserView::CreateSyncErrorViewIfNeeded() {
views::View* ProfileChooserView::CreateCurrentProfileView(
const AvatarMenu::Item& avatar_item,
bool is_guest) {
+ ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
+ const int vertical_spacing_small =
+ provider->GetDistanceMetric(DISTANCE_RELATED_CONTROL_VERTICAL_SMALL);
+ const int vertical_spacing =
+ provider->GetDistanceMetric(views::DISTANCE_RELATED_CONTROL_VERTICAL);
views::View* view = new views::View();
- view->SetLayoutManager(
- new views::BoxLayout(views::BoxLayout::kVertical, 0,
- views::kRelatedControlVerticalSpacing, 0));
+ view->SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0,
+ vertical_spacing_small, 0));
// Container for the profile photo and avatar/user name.
BackgroundColorHoverButton* current_profile_card =
@@ -1308,8 +1338,7 @@ views::View* ProfileChooserView::CreateCurrentProfileView(
(avatar_item.signed_in && !switches::IsEnableAccountConsistency()) ? 2
: 1;
int profile_card_height =
- kImageSide +
- 2 * (kBadgeSpacing + views::kRelatedControlSmallVerticalSpacing);
+ kImageSide + 2 * (kBadgeSpacing + vertical_spacing_small);
const int line_height = profile_card_height / num_labels;
grid_layout->StartRow(0, 0, line_height);
current_profile_card_ = current_profile_card;
@@ -1338,7 +1367,7 @@ views::View* ProfileChooserView::CreateCurrentProfileView(
: views::GridLayout::CENTER);
current_profile_card_->SetMinSize(gfx::Size(
kFixedMenuWidth, current_profile_photo->GetPreferredSize().height() +
- 2 * views::kRelatedControlSmallVerticalSpacing));
+ 2 * vertical_spacing_small));
view->AddChildView(current_profile_card_);
if (is_guest) {
@@ -1388,9 +1417,9 @@ views::View* ProfileChooserView::CreateCurrentProfileView(
browser_->profile()->GetOriginalProfile());
if (signin_manager->IsSigninAllowed()) {
views::View* extra_links_view = new views::View();
- views::BoxLayout* extra_links_layout = new views::BoxLayout(
- views::BoxLayout::kVertical, kMenuEdgeMargin,
- views::kRelatedControlVerticalSpacing, kMenuEdgeMargin);
+ views::BoxLayout* extra_links_layout =
+ new views::BoxLayout(views::BoxLayout::kVertical, kMenuEdgeMargin,
+ vertical_spacing, kMenuEdgeMargin);
extra_links_layout->set_cross_axis_alignment(
views::BoxLayout::CROSS_AXIS_ALIGNMENT_START);
extra_links_view->SetLayoutManager(extra_links_layout);
@@ -1408,8 +1437,8 @@ views::View* ProfileChooserView::CreateCurrentProfileView(
extra_links_view->AddChildView(signin_current_profile_button_);
base::RecordAction(
base::UserMetricsAction("Signin_Impression_FromAvatarBubbleSignin"));
- extra_links_view->SetBorder(views::CreateEmptyBorder(
- 0, 0, views::kRelatedControlSmallVerticalSpacing, 0));
+ extra_links_view->SetBorder(
+ views::CreateEmptyBorder(0, 0, vertical_spacing_small, 0));
view->AddChildView(extra_links_view);
}
@@ -1466,6 +1495,9 @@ views::View* ProfileChooserView::CreateOtherProfilesView(
views::View* ProfileChooserView::CreateOptionsView(bool display_lock,
AvatarMenu* avatar_menu) {
+ ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
+ const int vertical_spacing =
+ provider->GetDistanceMetric(views::DISTANCE_RELATED_CONTROL_VERTICAL);
views::View* view = new views::View();
views::GridLayout* layout = CreateSingleColumnLayout(view, kFixedMenuWidth);
@@ -1473,7 +1505,7 @@ views::View* ProfileChooserView::CreateOptionsView(bool display_lock,
const int kIconSize = 20;
// Add the user switching buttons
const int kProfileIconSize = 18;
- layout->StartRowWithPadding(1, 0, 0, views::kRelatedControlVerticalSpacing);
+ layout->StartRowWithPadding(1, 0, 0, vertical_spacing);
for (size_t i = 0; i < avatar_menu->GetNumberOfItems(); ++i) {
const AvatarMenu::Item& item = avatar_menu->GetItemAt(i);
if (!item.active) {
@@ -1542,7 +1574,7 @@ views::View* ProfileChooserView::CreateOptionsView(bool display_lock,
}
}
- layout->StartRowWithPadding(1, 0, 0, views::kRelatedControlVerticalSpacing);
+ layout->StartRowWithPadding(1, 0, 0, vertical_spacing);
return view;
}
@@ -1595,14 +1627,17 @@ views::View* ProfileChooserView::CreateCurrentProfileAccountsView(
CreateAccountButton(layout, accounts[i], false,
error_account_id == accounts[i], kFixedMenuWidth);
+ ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
+ const int vertical_spacing =
+ provider->GetDistanceMetric(views::DISTANCE_RELATED_CONTROL_VERTICAL);
if (!profile->IsSupervised()) {
- layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+ layout->AddPaddingRow(0, vertical_spacing);
add_account_link_ = CreateLink(l10n_util::GetStringFUTF16(
IDS_PROFILES_PROFILE_ADD_ACCOUNT_BUTTON, avatar_item.name), this);
- add_account_link_->SetBorder(
- views::CreateEmptyBorder(0, views::kButtonVEdgeMarginNew,
- views::kRelatedControlVerticalSpacing, 0));
+ add_account_link_->SetBorder(views::CreateEmptyBorder(
+ 0, provider->GetDistanceMetric(DISTANCE_DIALOG_BUTTON_MARGIN),
+ vertical_spacing, 0));
layout->StartRow(1, 0);
layout->AddView(add_account_link_);
}
@@ -1615,6 +1650,7 @@ void ProfileChooserView::CreateAccountButton(views::GridLayout* layout,
bool is_primary_account,
bool reauth_required,
int width) {
+ ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
std::string email = signin_ui_util::GetDisplayEmail(browser_->profile(),
account_id);
ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
@@ -1627,10 +1663,13 @@ void ProfileChooserView::CreateAccountButton(views::GridLayout* layout,
const int kIconSize = 18;
warning_default_image = gfx::CreateVectorIcon(ui::kWarningIcon, kIconSize,
gfx::kChromeIconGrey);
- warning_button_width = kIconSize + views::kRelatedButtonHSpacing;
+ warning_button_width =
+ kIconSize +
+ provider->GetDistanceMetric(views::DISTANCE_RELATED_BUTTON_HORIZONTAL);
}
- int available_width = width - 2 * views::kButtonHEdgeMarginNew -
- kDeleteButtonWidth - warning_button_width;
+ int available_width =
+ width - 2 * provider->GetDistanceMetric(DISTANCE_DIALOG_BUTTON_MARGIN) -
+ kDeleteButtonWidth - warning_button_width;
views::LabelButton* email_button = new BackgroundColorHoverButton(
this, base::UTF8ToUTF16(email), warning_default_image);
email_button->SetEnabled(reauth_required);
@@ -1655,7 +1694,8 @@ void ProfileChooserView::CreateAccountButton(views::GridLayout* layout,
delete_button->SetImage(views::ImageButton::STATE_PRESSED,
rb->GetImageSkiaNamed(IDR_CLOSE_1_P));
delete_button->SetBounds(
- width - views::kButtonHEdgeMarginNew - kDeleteButtonWidth,
+ width - provider->GetDistanceMetric(DISTANCE_DIALOG_BUTTON_MARGIN) -
+ kDeleteButtonWidth,
0, kDeleteButtonWidth, kButtonHeight);
email_button->set_notify_enter_exit_on_child(true);
@@ -1667,19 +1707,24 @@ void ProfileChooserView::CreateAccountButton(views::GridLayout* layout,
}
views::View* ProfileChooserView::CreateAccountRemovalView() {
+ ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
+ const int button_margin =
+ provider->GetDistanceMetric(DISTANCE_DIALOG_BUTTON_MARGIN);
+ const int unrelated_vertical_spacing =
+ provider->GetDistanceMetric(DISTANCE_UNRELATED_CONTROL_VERTICAL);
+
views::View* view = new views::View();
views::GridLayout* layout = CreateSingleColumnLayout(
- view, kFixedAccountRemovalViewWidth - 2 * views::kButtonHEdgeMarginNew);
- view->SetBorder(views::CreateEmptyBorder(0, views::kButtonHEdgeMarginNew,
- views::kButtonVEdgeMarginNew,
- views::kButtonHEdgeMarginNew));
+ view, kFixedAccountRemovalViewWidth - 2 * button_margin);
+ view->SetBorder(
+ views::CreateEmptyBorder(0, button_margin, button_margin, button_margin));
const std::string& primary_account = SigninManagerFactory::GetForProfile(
browser_->profile())->GetAuthenticatedAccountId();
bool is_primary_account = primary_account == account_id_to_remove_;
// Adds main text.
- layout->StartRowWithPadding(1, 0, 0, views::kUnrelatedControlVerticalSpacing);
+ layout->StartRowWithPadding(1, 0, 0, unrelated_vertical_spacing);
ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
const gfx::FontList& small_font_list =
rb->GetFontList(ui::ResourceBundle::SmallFont);
@@ -1715,11 +1760,10 @@ views::View* ProfileChooserView::CreateAccountRemovalView() {
this, l10n_util::GetStringUTF16(IDS_PROFILES_ACCOUNT_REMOVAL_BUTTON));
remove_account_button_->SetHorizontalAlignment(
gfx::ALIGN_CENTER);
- layout->StartRowWithPadding(
- 1, 0, 0, views::kUnrelatedControlVerticalSpacing);
+ layout->StartRowWithPadding(1, 0, 0, unrelated_vertical_spacing);
layout->AddView(remove_account_button_);
} else {
- layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
+ layout->AddPaddingRow(0, unrelated_vertical_spacing);
}
TitleCard* title_card = new TitleCard(
@@ -1787,19 +1831,23 @@ views::View* ProfileChooserView::CreateSigninErrorView() {
}
views::View* ProfileChooserView::CreateSwitchUserView() {
+ ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
+ const int button_margin =
+ provider->GetDistanceMetric(DISTANCE_DIALOG_BUTTON_MARGIN);
+ const int unrelated_vertical_spacing =
+ provider->GetDistanceMetric(DISTANCE_UNRELATED_CONTROL_VERTICAL);
views::View* view = new views::View();
views::GridLayout* layout = CreateSingleColumnLayout(
view, kFixedSwitchUserViewWidth);
views::ColumnSet* columns = layout->AddColumnSet(1);
- columns->AddPaddingColumn(0, views::kButtonHEdgeMarginNew);
- int label_width =
- kFixedSwitchUserViewWidth - 2 * views::kButtonHEdgeMarginNew;
+ columns->AddPaddingColumn(0, button_margin);
+ int label_width = kFixedSwitchUserViewWidth - 2 * button_margin;
columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 0,
views::GridLayout::FIXED, label_width, label_width);
- columns->AddPaddingColumn(0, views::kButtonHEdgeMarginNew);
+ columns->AddPaddingColumn(0, button_margin);
// Adds main text.
- layout->StartRowWithPadding(1, 1, 0, views::kUnrelatedControlVerticalSpacing);
+ layout->StartRowWithPadding(1, 1, 0, unrelated_vertical_spacing);
ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
const gfx::FontList& small_font_list =
rb->GetFontList(ui::ResourceBundle::SmallFont);
@@ -1814,7 +1862,7 @@ views::View* ProfileChooserView::CreateSwitchUserView() {
layout->AddView(content_label);
// Adds "Add person" button.
- layout->StartRowWithPadding(1, 0, 0, views::kUnrelatedControlVerticalSpacing);
+ layout->StartRowWithPadding(1, 0, 0, unrelated_vertical_spacing);
layout->AddView(new views::Separator());
const int kIconSize = 24;
« no previous file with comments | « chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc ('k') | chrome/browser/ui/views/translate/translate_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698