| Index: ash/system/user/tray_user.cc
|
| diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc
|
| index 4e81ed4548946f91752b76a5192c18eaa8d7f982..325d5e7a666339fff07772f0a416afb1f1ef8618 100644
|
| --- a/ash/system/user/tray_user.cc
|
| +++ b/ash/system/user/tray_user.cc
|
| @@ -32,8 +32,6 @@
|
| namespace {
|
|
|
| const int kUserInfoVerticalPadding = 10;
|
| -const int kUserInfoEmptyBorderLeftPadding = 6;
|
| -const int kUserInfoEmptyBorderRightPadding = 1;
|
| const int kUserIconSize = 27;
|
|
|
| } // namespace
|
| @@ -257,8 +255,6 @@ TrayUser::~TrayUser() {
|
| views::View* TrayUser::CreateTrayView(user::LoginStatus status) {
|
| CHECK(avatar_ == NULL);
|
| avatar_ = new tray::RoundedImageView(kTrayRoundedBorderRadius);
|
| - avatar_->set_border(views::Border::CreateEmptyBorder(
|
| - 0, kUserInfoEmptyBorderLeftPadding, 0, kUserInfoEmptyBorderRightPadding));
|
| UpdateAfterLoginStatusChange(status);
|
| return avatar_;
|
| }
|
| @@ -299,6 +295,10 @@ void TrayUser::UpdateAfterLoginStatusChange(user::LoginStatus status) {
|
| }
|
| }
|
|
|
| +void TrayUser::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
|
| + SetTrayImageItemBorder(avatar_, alignment);
|
| +}
|
| +
|
| void TrayUser::OnUserUpdate() {
|
| avatar_->SetImage(
|
| ash::Shell::GetInstance()->tray_delegate()->GetUserImage(),
|
|
|