Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(789)

Side by Side Diff: ash/system/tray/tray_item_view.h

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
oshima 2016/04/08 07:09:41 include?
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "ui/gfx/animation/animation_delegate.h" 10 #include "ui/gfx/animation/animation_delegate.h"
11 #include "ui/views/view.h" 11 #include "ui/views/view.h"
12 12
13 namespace gfx { 13 namespace gfx {
14 class SlideAnimation; 14 class SlideAnimation;
15 } 15 }
16 16
17 namespace views { 17 namespace views {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 private: 63 private:
64 // Overridden from views::View. 64 // Overridden from views::View.
65 void ChildPreferredSizeChanged(View* child) override; 65 void ChildPreferredSizeChanged(View* child) override;
66 66
67 // Overridden from gfx::AnimationDelegate. 67 // Overridden from gfx::AnimationDelegate.
68 void AnimationProgressed(const gfx::Animation* animation) override; 68 void AnimationProgressed(const gfx::Animation* animation) override;
69 void AnimationEnded(const gfx::Animation* animation) override; 69 void AnimationEnded(const gfx::Animation* animation) override;
70 void AnimationCanceled(const gfx::Animation* animation) override; 70 void AnimationCanceled(const gfx::Animation* animation) override;
71 71
72 SystemTrayItem* owner_; 72 SystemTrayItem* owner_;
73 scoped_ptr<gfx::SlideAnimation> animation_; 73 std::unique_ptr<gfx::SlideAnimation> animation_;
74 views::Label* label_; 74 views::Label* label_;
75 views::ImageView* image_view_; 75 views::ImageView* image_view_;
76 76
77 DISALLOW_COPY_AND_ASSIGN(TrayItemView); 77 DISALLOW_COPY_AND_ASSIGN(TrayItemView);
78 }; 78 };
79 79
80 } // namespace ash 80 } // namespace ash
81 81
82 #endif // ASH_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_ 82 #endif // ASH_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698