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/tray_item_view.h" | 7 #include "ash/system/tray/tray_item_view.h" |
| 8 #include "ash/system/tray/tray_views.h" |
8 #include "ui/base/resource/resource_bundle.h" | 9 #include "ui/base/resource/resource_bundle.h" |
9 #include "ui/gfx/image/image.h" | 10 #include "ui/gfx/image/image.h" |
10 #include "ui/views/controls/image_view.h" | 11 #include "ui/views/controls/image_view.h" |
11 #include "ui/views/layout/fill_layout.h" | 12 #include "ui/views/layout/fill_layout.h" |
12 | 13 |
13 namespace ash { | 14 namespace ash { |
14 namespace internal { | 15 namespace internal { |
15 | 16 |
16 TrayImageItem::TrayImageItem(int resource_id) | 17 TrayImageItem::TrayImageItem(int resource_id) |
17 : resource_id_(resource_id), | 18 : resource_id_(resource_id), |
(...skipping 20 matching lines...) Expand all Loading... |
38 return NULL; | 39 return NULL; |
39 } | 40 } |
40 | 41 |
41 views::View* TrayImageItem::CreateDetailedView(user::LoginStatus status) { | 42 views::View* TrayImageItem::CreateDetailedView(user::LoginStatus status) { |
42 return NULL; | 43 return NULL; |
43 } | 44 } |
44 | 45 |
45 void TrayImageItem::UpdateAfterLoginStatusChange(user::LoginStatus status) { | 46 void TrayImageItem::UpdateAfterLoginStatusChange(user::LoginStatus status) { |
46 } | 47 } |
47 | 48 |
| 49 void TrayImageItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) { |
| 50 SetTrayImageItemBorder(tray_view_, alignment); |
| 51 } |
| 52 |
48 void TrayImageItem::DestroyTrayView() { | 53 void TrayImageItem::DestroyTrayView() { |
49 tray_view_ = NULL; | 54 tray_view_ = NULL; |
50 } | 55 } |
51 | 56 |
52 void TrayImageItem::DestroyDefaultView() { | 57 void TrayImageItem::DestroyDefaultView() { |
53 } | 58 } |
54 | 59 |
55 void TrayImageItem::DestroyDetailedView() { | 60 void TrayImageItem::DestroyDetailedView() { |
56 } | 61 } |
57 | 62 |
58 } // namespace internal | 63 } // namespace internal |
59 } // namespace ash | 64 } // namespace ash |
OLD | NEW |