chrome/browser/ui/views/profiles/profile_chooser_view.cc - Issue 371633002: LabelButton: cache the last computed preferred size

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 371633002: LabelButton: cache the last computed preferred size (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 years, 5 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/profiles/new_avatar_button.cc ('k') | chrome/browser/ui/views/profiles/profile_reset_bubble_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 4afac61d08630e36e90560b0d30b33bb993228d8..1f5b7f72850c294533bfaf39af81928d8a87776b 100644

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

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

@@ -149,7 +149,7 @@ BackgroundColorHoverButton::BackgroundColorHoverButton(

: views::LabelButton(listener, text) {

SetBorder(views::Border::CreateEmptyBorder(0, views::kButtonHEdgeMarginNew,

0, views::kButtonHEdgeMarginNew));

- set_min_size(gfx::Size(0, kButtonHeight));

+ SetMinSize(gfx::Size(0, kButtonHeight));

SetImage(STATE_NORMAL, normal_icon);

SetImage(STATE_HOVERED, hover_icon);

SetImage(STATE_PRESSED, hover_icon);

@@ -1167,7 +1167,7 @@ views::View* ProfileChooserView::CreateOtherProfilesView(

item.name,

*image.ToImageSkia(),

*image.ToImageSkia());

- button->set_min_size(gfx::Size(

+ button->SetMinSize(gfx::Size(

0, kButtonHeight + views::kRelatedControlVerticalSpacing));

open_other_profile_indexes_map_[button] = index;

@@ -1217,7 +1217,7 @@ views::View* ProfileChooserView::CreateOptionsView(bool enable_lock) {

text,

*rb->GetImageSkiaNamed(IDR_ICON_PROFILES_MENU_AVATAR),

*rb->GetImageSkiaNamed(IDR_ICON_PROFILES_MENU_AVATAR));

- users_button_->set_min_size(gfx::Size(

+ users_button_->SetMinSize(gfx::Size(

0, kButtonHeight + views::kRelatedControlVerticalSpacing));

layout->StartRow(1, 0);

@@ -1229,7 +1229,7 @@ views::View* ProfileChooserView::CreateOptionsView(bool enable_lock) {

base::string16(),

*rb->GetImageSkiaNamed(IDR_ICON_PROFILES_MENU_LOCK),

*rb->GetImageSkiaNamed(IDR_ICON_PROFILES_MENU_LOCK));

- lock_button_->set_min_size(gfx::Size(

+ lock_button_->SetMinSize(gfx::Size(

0, kButtonHeight + views::kRelatedControlVerticalSpacing));

layout->AddView(lock_button_);

}