| Index: ash/system/tray/tray_image_item.cc
|
| diff --git a/ash/system/tray/tray_image_item.cc b/ash/system/tray/tray_image_item.cc
|
| index 449cbd72c7a8d46d3171745b2c1b91be05fc6f59..9d1c80a5251b3cb05552221264d1a4885c826183 100644
|
| --- a/ash/system/tray/tray_image_item.cc
|
| +++ b/ash/system/tray/tray_image_item.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "ash/system/tray/tray_image_item.h"
|
|
|
| +#include "ash/shell.h"
|
| +#include "ash/system/tray/system_tray.h"
|
| #include "ash/system/tray/tray_item_view.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "ui/gfx/image/image.h"
|
| @@ -31,6 +33,8 @@ views::View* TrayImageItem::CreateTrayView(user::LoginStatus status) {
|
| tray_view_->image_view()->SetImage(ui::ResourceBundle::GetSharedInstance().
|
| GetImageNamed(resource_id_).ToImageSkia());
|
| tray_view_->SetVisible(GetInitialVisibility());
|
| + UpdateAfterShelfAlignmentChange(
|
| + ash::Shell::GetInstance()->system_tray()->shelf_alignment());
|
| return tray_view_;
|
| }
|
|
|
| @@ -45,6 +49,10 @@ views::View* TrayImageItem::CreateDetailedView(user::LoginStatus status) {
|
| void TrayImageItem::UpdateAfterLoginStatusChange(user::LoginStatus status) {
|
| }
|
|
|
| +void TrayImageItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
|
| + SetTrayImageItemBorder(tray_view_, alignment);
|
| +}
|
| +
|
| void TrayImageItem::DestroyTrayView() {
|
| tray_view_ = NULL;
|
| }
|
|
|