| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/common/system/tray/tray_image_item.h" | 5 #include "ash/common/system/tray/tray_image_item.h" |
| 6 | 6 |
| 7 #include "ash/common/shelf/wm_shelf_util.h" | 7 #include "ash/common/shelf/wm_shelf_util.h" |
| 8 #include "ash/common/system/tray/tray_item_view.h" | 8 #include "ash/common/system/tray/tray_item_view.h" |
| 9 #include "ash/common/system/tray/tray_utils.h" | 9 #include "ash/common/system/tray/tray_utils.h" |
| 10 #include "ash/system/tray/system_tray.h" | 10 #include "ash/system/tray/system_tray.h" |
| 11 #include "ui/base/resource/resource_bundle.h" | 11 #include "ui/base/resource/resource_bundle.h" |
| 12 #include "ui/gfx/image/image.h" | 12 #include "ui/gfx/image/image.h" |
| 13 #include "ui/views/controls/image_view.h" | 13 #include "ui/views/controls/image_view.h" |
| 14 #include "ui/views/layout/box_layout.h" | 14 #include "ui/views/layout/box_layout.h" |
| 15 | 15 |
| 16 namespace ash { | 16 namespace ash { |
| 17 | 17 |
| 18 TrayImageItem::TrayImageItem(SystemTray* system_tray, int resource_id) | 18 TrayImageItem::TrayImageItem(SystemTray* system_tray, int resource_id) |
| 19 : SystemTrayItem(system_tray), | 19 : SystemTrayItem(system_tray), |
| 20 resource_id_(resource_id), | 20 resource_id_(resource_id), |
| 21 tray_view_(NULL) { | 21 tray_view_(NULL) {} |
| 22 } | |
| 23 | 22 |
| 24 TrayImageItem::~TrayImageItem() {} | 23 TrayImageItem::~TrayImageItem() {} |
| 25 | 24 |
| 26 views::View* TrayImageItem::tray_view() { | 25 views::View* TrayImageItem::tray_view() { |
| 27 return tray_view_; | 26 return tray_view_; |
| 28 } | 27 } |
| 29 | 28 |
| 30 void TrayImageItem::SetImageFromResourceId(int resource_id) { | 29 void TrayImageItem::SetImageFromResourceId(int resource_id) { |
| 31 resource_id_ = resource_id; | 30 resource_id_ = resource_id; |
| 32 if (!tray_view_) | 31 if (!tray_view_) |
| 33 return; | 32 return; |
| 34 tray_view_->image_view()->SetImage(ui::ResourceBundle::GetSharedInstance(). | 33 tray_view_->image_view()->SetImage(ui::ResourceBundle::GetSharedInstance() |
| 35 GetImageNamed(resource_id_).ToImageSkia()); | 34 .GetImageNamed(resource_id_) |
| 35 .ToImageSkia()); |
| 36 } | 36 } |
| 37 | 37 |
| 38 views::View* TrayImageItem::CreateTrayView(LoginStatus status) { | 38 views::View* TrayImageItem::CreateTrayView(LoginStatus status) { |
| 39 CHECK(tray_view_ == NULL); | 39 CHECK(tray_view_ == NULL); |
| 40 tray_view_ = new TrayItemView(this); | 40 tray_view_ = new TrayItemView(this); |
| 41 tray_view_->CreateImageView(); | 41 tray_view_->CreateImageView(); |
| 42 tray_view_->image_view()->SetImage(ui::ResourceBundle::GetSharedInstance(). | 42 tray_view_->image_view()->SetImage(ui::ResourceBundle::GetSharedInstance() |
| 43 GetImageNamed(resource_id_).ToImageSkia()); | 43 .GetImageNamed(resource_id_) |
| 44 .ToImageSkia()); |
| 44 tray_view_->SetVisible(GetInitialVisibility()); | 45 tray_view_->SetVisible(GetInitialVisibility()); |
| 45 SetItemAlignment(system_tray()->shelf_alignment()); | 46 SetItemAlignment(system_tray()->shelf_alignment()); |
| 46 return tray_view_; | 47 return tray_view_; |
| 47 } | 48 } |
| 48 | 49 |
| 49 views::View* TrayImageItem::CreateDefaultView(LoginStatus status) { | 50 views::View* TrayImageItem::CreateDefaultView(LoginStatus status) { |
| 50 return nullptr; | 51 return nullptr; |
| 51 } | 52 } |
| 52 | 53 |
| 53 views::View* TrayImageItem::CreateDetailedView(LoginStatus status) { | 54 views::View* TrayImageItem::CreateDetailedView(LoginStatus status) { |
| 54 return nullptr; | 55 return nullptr; |
| 55 } | 56 } |
| 56 | 57 |
| 57 void TrayImageItem::UpdateAfterLoginStatusChange(LoginStatus status) {} | 58 void TrayImageItem::UpdateAfterLoginStatusChange(LoginStatus status) {} |
| 58 | 59 |
| 59 void TrayImageItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) { | 60 void TrayImageItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) { |
| 60 SetTrayImageItemBorder(tray_view_, alignment); | 61 SetTrayImageItemBorder(tray_view_, alignment); |
| 61 SetItemAlignment(alignment); | 62 SetItemAlignment(alignment); |
| 62 } | 63 } |
| 63 | 64 |
| 64 void TrayImageItem::DestroyTrayView() { | 65 void TrayImageItem::DestroyTrayView() { |
| 65 tray_view_ = NULL; | 66 tray_view_ = NULL; |
| 66 } | 67 } |
| 67 | 68 |
| 68 void TrayImageItem::DestroyDefaultView() { | 69 void TrayImageItem::DestroyDefaultView() {} |
| 69 } | |
| 70 | 70 |
| 71 void TrayImageItem::DestroyDetailedView() { | 71 void TrayImageItem::DestroyDetailedView() {} |
| 72 } | |
| 73 | 72 |
| 74 void TrayImageItem::SetItemAlignment(ShelfAlignment alignment) { | 73 void TrayImageItem::SetItemAlignment(ShelfAlignment alignment) { |
| 75 // Center the item dependent on the orientation of the shelf. | 74 // Center the item dependent on the orientation of the shelf. |
| 76 views::BoxLayout::Orientation layout = IsHorizontalAlignment(alignment) | 75 views::BoxLayout::Orientation layout = IsHorizontalAlignment(alignment) |
| 77 ? views::BoxLayout::kHorizontal | 76 ? views::BoxLayout::kHorizontal |
| 78 : views::BoxLayout::kVertical; | 77 : views::BoxLayout::kVertical; |
| 79 tray_view_->SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0)); | 78 tray_view_->SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0)); |
| 80 tray_view_->Layout(); | 79 tray_view_->Layout(); |
| 81 } | 80 } |
| 82 | 81 |
| 83 } // namespace ash | 82 } // namespace ash |
| OLD | NEW |