chrome/browser/ui/views/avatar_menu_bubble_view.cc - Issue 11377005: Replace Label::Alignment with gfx::HorizontalAlignment

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/avatar_menu_bubble_view.cc

Issue 11377005: Replace Label::Alignment with gfx::HorizontalAlignment (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix remaining Label::Alignment references. Created 8 years, 1 month 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/autofill/autofill_dialog_views.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_prompt_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/avatar_menu_bubble_view.cc

diff --git a/chrome/browser/ui/views/avatar_menu_bubble_view.cc b/chrome/browser/ui/views/avatar_menu_bubble_view.cc

index 6926e6b94f60281682413e25cdeddff01b66c53a..5472cd25c7dd31f3b1ed9e36600ab039087696c3 100644

--- a/chrome/browser/ui/views/avatar_menu_bubble_view.cc

+++ b/chrome/browser/ui/views/avatar_menu_bubble_view.cc

@@ -249,7 +249,7 @@ ProfileItemView::ProfileItemView(const AvatarMenuModel::Item& item,

const int kNameFontDelta = 1;

name_label_ = new views::Label(item_.name,

base_font.DeriveFont(kNameFontDelta, style));

- name_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);

+ name_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);

AddChildView(name_label_);

// Add a label to show the sync state.

@@ -258,7 +258,7 @@ ProfileItemView::ProfileItemView(const AvatarMenuModel::Item& item,

if (item_.signed_in)

sync_state_label_->SetElideBehavior(views::Label::ELIDE_AS_EMAIL);

sync_state_label_->SetFont(base_font.DeriveFont(kStateFontDelta));

- sync_state_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);

+ sync_state_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);

sync_state_label_->SetEnabled(false);

AddChildView(sync_state_label_);

@@ -266,7 +266,7 @@ ProfileItemView::ProfileItemView(const AvatarMenuModel::Item& item,

edit_link_ = new EditProfileLink(

l10n_util::GetStringUTF16(IDS_PROFILES_EDIT_PROFILE_LINK), this);

edit_link_->set_listener(edit_profile_listener);

- edit_link_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);

+ edit_link_->SetHorizontalAlignment(gfx::ALIGN_LEFT);

edit_link_->SetEnabledColor(SkColorSetRGB(0xe3, 0xed, 0xf6));

edit_link_->SetHasFocusBorder(true);

AddChildView(edit_link_);

@@ -546,7 +546,7 @@ void AvatarMenuBubbleView::OnAvatarMenuModelChanged(

add_profile_link_ = new views::Link(

l10n_util::GetStringUTF16(IDS_PROFILES_CREATE_NEW_PROFILE_LINK));

add_profile_link_->set_listener(this);

- add_profile_link_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);

+ add_profile_link_->SetHorizontalAlignment(gfx::ALIGN_LEFT);

add_profile_link_->SetBackgroundColor(color());

add_profile_link_->SetEnabledColor(SkColorSetRGB(0xe3, 0xed, 0xf6));

AddChildView(add_profile_link_);