| 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 #ifndef ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_ | 5 #ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_ |
| 6 #define ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_ | 6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_ |
| 7 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "ash/system/tray/system_tray_item.h" | 9 #include "ash/common/system/tray/system_tray_item.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 | 11 |
| 12 namespace views { | 12 namespace views { |
| 13 class ImageView; | 13 class ImageView; |
| 14 } | 14 } |
| 15 | 15 |
| 16 namespace ash { | 16 namespace ash { |
| 17 class TrayItemView; | 17 class TrayItemView; |
| 18 | 18 |
| 19 class ASH_EXPORT TrayImageItem : public SystemTrayItem { | 19 class ASH_EXPORT TrayImageItem : public SystemTrayItem { |
| (...skipping 24 matching lines...) Expand all Loading... |
| 44 void SetItemAlignment(ShelfAlignment alignment); | 44 void SetItemAlignment(ShelfAlignment alignment); |
| 45 | 45 |
| 46 int resource_id_; | 46 int resource_id_; |
| 47 TrayItemView* tray_view_; | 47 TrayItemView* tray_view_; |
| 48 | 48 |
| 49 DISALLOW_COPY_AND_ASSIGN(TrayImageItem); | 49 DISALLOW_COPY_AND_ASSIGN(TrayImageItem); |
| 50 }; | 50 }; |
| 51 | 51 |
| 52 } // namespace ash | 52 } // namespace ash |
| 53 | 53 |
| 54 #endif // ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_ | 54 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_ |
| OLD | NEW |