| 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 b08a4360bbb25be5de566a8c00a9382d17fd21e1..c8a8af3ba181179ef0e6215ba337a97316623c3c 100644
|
| --- a/ash/system/tray/tray_image_item.cc
|
| +++ b/ash/system/tray/tray_image_item.cc
|
| @@ -36,7 +36,7 @@ void TrayImageItem::SetImageFromResourceId(int resource_id) {
|
| GetImageNamed(resource_id_).ToImageSkia());
|
| }
|
|
|
| -views::View* TrayImageItem::CreateTrayView(user::LoginStatus status) {
|
| +views::View* TrayImageItem::CreateTrayView(LoginStatus status) {
|
| CHECK(tray_view_ == NULL);
|
| tray_view_ = new TrayItemView(this);
|
| tray_view_->CreateImageView();
|
| @@ -47,16 +47,15 @@ views::View* TrayImageItem::CreateTrayView(user::LoginStatus status) {
|
| return tray_view_;
|
| }
|
|
|
| -views::View* TrayImageItem::CreateDefaultView(user::LoginStatus status) {
|
| - return NULL;
|
| +views::View* TrayImageItem::CreateDefaultView(LoginStatus status) {
|
| + return nullptr;
|
| }
|
|
|
| -views::View* TrayImageItem::CreateDetailedView(user::LoginStatus status) {
|
| - return NULL;
|
| +views::View* TrayImageItem::CreateDetailedView(LoginStatus status) {
|
| + return nullptr;
|
| }
|
|
|
| -void TrayImageItem::UpdateAfterLoginStatusChange(user::LoginStatus status) {
|
| -}
|
| +void TrayImageItem::UpdateAfterLoginStatusChange(LoginStatus status) {}
|
|
|
| void TrayImageItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
|
| SetTrayImageItemBorder(tray_view_, alignment);
|
|
|