| 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, |
| 19 : SystemTrayItem(system_tray), | 19 int resource_id, |
| 20 UmaType uma_type) |
| 21 : SystemTrayItem(system_tray, uma_type), |
| 20 resource_id_(resource_id), | 22 resource_id_(resource_id), |
| 21 tray_view_(NULL) {} | 23 tray_view_(NULL) {} |
| 22 | 24 |
| 23 TrayImageItem::~TrayImageItem() {} | 25 TrayImageItem::~TrayImageItem() {} |
| 24 | 26 |
| 25 views::View* TrayImageItem::tray_view() { | 27 views::View* TrayImageItem::tray_view() { |
| 26 return tray_view_; | 28 return tray_view_; |
| 27 } | 29 } |
| 28 | 30 |
| 29 void TrayImageItem::SetImageFromResourceId(int resource_id) { | 31 void TrayImageItem::SetImageFromResourceId(int resource_id) { |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 void TrayImageItem::SetItemAlignment(ShelfAlignment alignment) { | 75 void TrayImageItem::SetItemAlignment(ShelfAlignment alignment) { |
| 74 // Center the item dependent on the orientation of the shelf. | 76 // Center the item dependent on the orientation of the shelf. |
| 75 views::BoxLayout::Orientation layout = IsHorizontalAlignment(alignment) | 77 views::BoxLayout::Orientation layout = IsHorizontalAlignment(alignment) |
| 76 ? views::BoxLayout::kHorizontal | 78 ? views::BoxLayout::kHorizontal |
| 77 : views::BoxLayout::kVertical; | 79 : views::BoxLayout::kVertical; |
| 78 tray_view_->SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0)); | 80 tray_view_->SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0)); |
| 79 tray_view_->Layout(); | 81 tray_view_->Layout(); |
| 80 } | 82 } |
| 81 | 83 |
| 82 } // namespace ash | 84 } // namespace ash |
| OLD | NEW |