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

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

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « ash/system/tray/tray_item_more.h ('k') | ash/system/tray/tray_notification_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ui/gfx/animation/animation_delegate.h" 9 #include "ui/gfx/animation/animation_delegate.h"
10 #include "ui/views/view.h" 10 #include "ui/views/view.h"
(...skipping 23 matching lines...) Expand all
34 34
35 // Convenience function for creating a child Label or ImageView. 35 // Convenience function for creating a child Label or ImageView.
36 void CreateLabel(); 36 void CreateLabel();
37 void CreateImageView(); 37 void CreateImageView();
38 38
39 SystemTrayItem* owner() const { return owner_; } 39 SystemTrayItem* owner() const { return owner_; }
40 views::Label* label() const { return label_; } 40 views::Label* label() const { return label_; }
41 views::ImageView* image_view() const { return image_view_; } 41 views::ImageView* image_view() const { return image_view_; }
42 42
43 // Overridden from views::View. 43 // Overridden from views::View.
44 virtual void SetVisible(bool visible) OVERRIDE; 44 virtual void SetVisible(bool visible) override;
45 virtual gfx::Size GetPreferredSize() const OVERRIDE; 45 virtual gfx::Size GetPreferredSize() const override;
46 virtual int GetHeightForWidth(int width) const OVERRIDE; 46 virtual int GetHeightForWidth(int width) const override;
47 47
48 protected: 48 protected:
49 // Makes sure the widget relayouts after the size/visibility of the view 49 // Makes sure the widget relayouts after the size/visibility of the view
50 // changes. 50 // changes.
51 void ApplyChange(); 51 void ApplyChange();
52 52
53 // This should return the desired size of the view. For most views, this 53 // This should return the desired size of the view. For most views, this
54 // returns GetPreferredSize. But since this class overrides GetPreferredSize 54 // returns GetPreferredSize. But since this class overrides GetPreferredSize
55 // for animation purposes, we allow a different way to get this size, and do 55 // for animation purposes, we allow a different way to get this size, and do
56 // not allow GetPreferredSize to be overridden. 56 // not allow GetPreferredSize to be overridden.
57 virtual gfx::Size DesiredSize() const; 57 virtual gfx::Size DesiredSize() const;
58 58
59 // The default animation duration is 200ms. But each view can customize this. 59 // The default animation duration is 200ms. But each view can customize this.
60 virtual int GetAnimationDurationMS(); 60 virtual int GetAnimationDurationMS();
61 61
62 private: 62 private:
63 // Overridden from views::View. 63 // Overridden from views::View.
64 virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; 64 virtual void ChildPreferredSizeChanged(View* child) override;
65 65
66 // Overridden from gfx::AnimationDelegate. 66 // Overridden from gfx::AnimationDelegate.
67 virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; 67 virtual void AnimationProgressed(const gfx::Animation* animation) override;
68 virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; 68 virtual void AnimationEnded(const gfx::Animation* animation) override;
69 virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE; 69 virtual void AnimationCanceled(const gfx::Animation* animation) override;
70 70
71 SystemTrayItem* owner_; 71 SystemTrayItem* owner_;
72 scoped_ptr<gfx::SlideAnimation> animation_; 72 scoped_ptr<gfx::SlideAnimation> animation_;
73 views::Label* label_; 73 views::Label* label_;
74 views::ImageView* image_view_; 74 views::ImageView* image_view_;
75 75
76 DISALLOW_COPY_AND_ASSIGN(TrayItemView); 76 DISALLOW_COPY_AND_ASSIGN(TrayItemView);
77 }; 77 };
78 78
79 } // namespace ash 79 } // namespace ash
80 80
81 #endif // ASH_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_ 81 #endif // ASH_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_
OLDNEW
« no previous file with comments | « ash/system/tray/tray_item_more.h ('k') | ash/system/tray/tray_notification_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698