| 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/system/tray/tray_image_item.h" | 5 #include "ash/system/tray/tray_image_item.h" |
| 6 | 6 |
| 7 #include "ash/system/tray/system_tray.h" | 7 #include "ash/system/tray/system_tray.h" |
| 8 #include "ash/system/tray/tray_item_view.h" | 8 #include "ash/system/tray/tray_item_view.h" |
| 9 #include "ash/system/tray/tray_utils.h" | 9 #include "ash/system/tray/tray_utils.h" |
| 10 #include "ui/base/resource/resource_bundle.h" | 10 #include "ui/base/resource/resource_bundle.h" |
| 11 #include "ui/gfx/image/image.h" | 11 #include "ui/gfx/image/image.h" |
| 12 #include "ui/views/controls/image_view.h" | 12 #include "ui/views/controls/image_view.h" |
| 13 #include "ui/views/layout/box_layout.h" | 13 #include "ui/views/layout/box_layout.h" |
| 14 | 14 |
| 15 namespace ash { | 15 namespace ash { |
| 16 namespace internal { | |
| 17 | 16 |
| 18 TrayImageItem::TrayImageItem(SystemTray* system_tray, int resource_id) | 17 TrayImageItem::TrayImageItem(SystemTray* system_tray, int resource_id) |
| 19 : SystemTrayItem(system_tray), | 18 : SystemTrayItem(system_tray), |
| 20 resource_id_(resource_id), | 19 resource_id_(resource_id), |
| 21 tray_view_(NULL) { | 20 tray_view_(NULL) { |
| 22 } | 21 } |
| 23 | 22 |
| 24 TrayImageItem::~TrayImageItem() {} | 23 TrayImageItem::~TrayImageItem() {} |
| 25 | 24 |
| 26 views::View* TrayImageItem::tray_view() { | 25 views::View* TrayImageItem::tray_view() { |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 break; | 81 break; |
| 83 case ash::SHELF_ALIGNMENT_LEFT: | 82 case ash::SHELF_ALIGNMENT_LEFT: |
| 84 case ash::SHELF_ALIGNMENT_RIGHT: | 83 case ash::SHELF_ALIGNMENT_RIGHT: |
| 85 layout = views::BoxLayout::kVertical; | 84 layout = views::BoxLayout::kVertical; |
| 86 break; | 85 break; |
| 87 } | 86 } |
| 88 tray_view_->SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0)); | 87 tray_view_->SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0)); |
| 89 tray_view_->Layout(); | 88 tray_view_->Layout(); |
| 90 } | 89 } |
| 91 | 90 |
| 92 } // namespace internal | |
| 93 } // namespace ash | 91 } // namespace ash |
| OLD | NEW |