| 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_COMMON_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_ | 5 #ifndef ASH_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_ | 
| 6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_ | 6 #define ASH_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_ | 
| 7 | 7 | 
| 8 #include <memory> | 8 #include <memory> | 
| 9 | 9 | 
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" | 
| 11 #include "base/macros.h" | 11 #include "base/macros.h" | 
| 12 #include "ui/gfx/animation/animation_delegate.h" | 12 #include "ui/gfx/animation/animation_delegate.h" | 
| 13 #include "ui/views/view.h" | 13 #include "ui/views/view.h" | 
| 14 | 14 | 
| 15 namespace gfx { | 15 namespace gfx { | 
| 16 class SlideAnimation; | 16 class SlideAnimation; | 
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 68   std::unique_ptr<gfx::SlideAnimation> animation_; | 68   std::unique_ptr<gfx::SlideAnimation> animation_; | 
| 69   // Only one of |label_| and |image_view_| should be non-null. | 69   // Only one of |label_| and |image_view_| should be non-null. | 
| 70   views::Label* label_; | 70   views::Label* label_; | 
| 71   views::ImageView* image_view_; | 71   views::ImageView* image_view_; | 
| 72 | 72 | 
| 73   DISALLOW_COPY_AND_ASSIGN(TrayItemView); | 73   DISALLOW_COPY_AND_ASSIGN(TrayItemView); | 
| 74 }; | 74 }; | 
| 75 | 75 | 
| 76 }  // namespace ash | 76 }  // namespace ash | 
| 77 | 77 | 
| 78 #endif  // ASH_COMMON_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_ | 78 #endif  // ASH_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_ | 
| OLD | NEW | 
|---|