| 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" |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 } | 69 } |
| 70 | 70 |
| 71 void TrayImageItem::DestroyDetailedView() { | 71 void TrayImageItem::DestroyDetailedView() { |
| 72 } | 72 } |
| 73 | 73 |
| 74 void TrayImageItem::SetItemAlignment(ShelfAlignment alignment) { | 74 void TrayImageItem::SetItemAlignment(ShelfAlignment alignment) { |
| 75 // Center the item dependent on the orientation of the shelf. | 75 // Center the item dependent on the orientation of the shelf. |
| 76 views::BoxLayout::Orientation layout = views::BoxLayout::kHorizontal; | 76 views::BoxLayout::Orientation layout = views::BoxLayout::kHorizontal; |
| 77 switch (alignment) { | 77 switch (alignment) { |
| 78 case ash::SHELF_ALIGNMENT_BOTTOM: | 78 case ash::SHELF_ALIGNMENT_BOTTOM: |
| 79 case ash::SHELF_ALIGNMENT_TOP: | |
| 80 layout = views::BoxLayout::kHorizontal; | 79 layout = views::BoxLayout::kHorizontal; |
| 81 break; | 80 break; |
| 82 case ash::SHELF_ALIGNMENT_LEFT: | 81 case ash::SHELF_ALIGNMENT_LEFT: |
| 83 case ash::SHELF_ALIGNMENT_RIGHT: | 82 case ash::SHELF_ALIGNMENT_RIGHT: |
| 84 layout = views::BoxLayout::kVertical; | 83 layout = views::BoxLayout::kVertical; |
| 85 break; | 84 break; |
| 86 } | 85 } |
| 87 tray_view_->SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0)); | 86 tray_view_->SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0)); |
| 88 tray_view_->Layout(); | 87 tray_view_->Layout(); |
| 89 } | 88 } |
| 90 | 89 |
| 91 } // namespace ash | 90 } // namespace ash |
| OLD | NEW |