| 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_ITEM_VIEW_H_ | 5 #ifndef ASH_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_ |
| 6 #define ASH_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_ | 6 #define ASH_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_ |
| 7 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "base/macros.h" |
| 9 #include "ui/gfx/animation/animation_delegate.h" | 10 #include "ui/gfx/animation/animation_delegate.h" |
| 10 #include "ui/views/view.h" | 11 #include "ui/views/view.h" |
| 11 | 12 |
| 12 namespace gfx { | 13 namespace gfx { |
| 13 class SlideAnimation; | 14 class SlideAnimation; |
| 14 } | 15 } |
| 15 | 16 |
| 16 namespace views { | 17 namespace views { |
| 17 class ImageView; | 18 class ImageView; |
| 18 class Label; | 19 class Label; |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 scoped_ptr<gfx::SlideAnimation> animation_; | 73 scoped_ptr<gfx::SlideAnimation> animation_; |
| 73 views::Label* label_; | 74 views::Label* label_; |
| 74 views::ImageView* image_view_; | 75 views::ImageView* image_view_; |
| 75 | 76 |
| 76 DISALLOW_COPY_AND_ASSIGN(TrayItemView); | 77 DISALLOW_COPY_AND_ASSIGN(TrayItemView); |
| 77 }; | 78 }; |
| 78 | 79 |
| 79 } // namespace ash | 80 } // namespace ash |
| 80 | 81 |
| 81 #endif // ASH_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_ | 82 #endif // ASH_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1540753002:
Switch to standard integer types in ash/. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master