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

Side by Side Diff: ash/system/tray/tray_item_more.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_image_item.h ('k') | ash/system/tray/tray_item_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_MORE_H_ 5 #ifndef ASH_SYSTEM_TRAY_TRAY_ITEM_MORE_H_
6 #define ASH_SYSTEM_TRAY_TRAY_ITEM_MORE_H_ 6 #define ASH_SYSTEM_TRAY_TRAY_ITEM_MORE_H_
7 7
8 #include "ash/system/tray/actionable_view.h" 8 #include "ash/system/tray/actionable_view.h"
9 #include "ui/views/view.h" 9 #include "ui/views/view.h"
10 10
(...skipping 20 matching lines...) Expand all
31 void SetAccessibleName(const base::string16& name); 31 void SetAccessibleName(const base::string16& name);
32 32
33 protected: 33 protected:
34 // Replaces the default icon (on the left of the label), and allows a custom 34 // Replaces the default icon (on the left of the label), and allows a custom
35 // view to be placed there. Once the default icon is replaced, |SetImage| 35 // view to be placed there. Once the default icon is replaced, |SetImage|
36 // should never be called. 36 // should never be called.
37 void ReplaceIcon(views::View* view); 37 void ReplaceIcon(views::View* view);
38 38
39 private: 39 private:
40 // Overridden from ActionableView. 40 // Overridden from ActionableView.
41 virtual bool PerformAction(const ui::Event& event) OVERRIDE; 41 virtual bool PerformAction(const ui::Event& event) override;
42 42
43 // Overridden from views::View. 43 // Overridden from views::View.
44 virtual void Layout() OVERRIDE; 44 virtual void Layout() override;
45 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; 45 virtual void GetAccessibleState(ui::AXViewState* state) override;
46 46
47 SystemTrayItem* owner_; 47 SystemTrayItem* owner_;
48 // True if |more_| should be shown. 48 // True if |more_| should be shown.
49 bool show_more_; 49 bool show_more_;
50 views::ImageView* icon_; 50 views::ImageView* icon_;
51 views::Label* label_; 51 views::Label* label_;
52 views::ImageView* more_; 52 views::ImageView* more_;
53 base::string16 accessible_name_; 53 base::string16 accessible_name_;
54 54
55 DISALLOW_COPY_AND_ASSIGN(TrayItemMore); 55 DISALLOW_COPY_AND_ASSIGN(TrayItemMore);
56 }; 56 };
57 57
58 } // namespace ash 58 } // namespace ash
59 59
60 #endif // ASH_SYSTEM_TRAY_TRAY_ITEM_MORE_H_ 60 #endif // ASH_SYSTEM_TRAY_TRAY_ITEM_MORE_H_
OLDNEW
« no previous file with comments | « ash/system/tray/tray_image_item.h ('k') | ash/system/tray/tray_item_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698