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

Side by Side Diff: ash/system/tray/tray_image_item.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_event_filter.h ('k') | ash/system/tray/tray_item_more.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_IMAGE_ITEM_H_ 5 #ifndef ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_
6 #define ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_ 6 #define ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_
7 7
8 #include "ash/system/tray/system_tray_item.h" 8 #include "ash/system/tray/system_tray_item.h"
9 9
10 namespace views { 10 namespace views {
(...skipping 10 matching lines...) Expand all
21 21
22 views::View* tray_view(); 22 views::View* tray_view();
23 23
24 // Changes the icon of the tray-view to the specified resource. 24 // Changes the icon of the tray-view to the specified resource.
25 void SetImageFromResourceId(int resource_id); 25 void SetImageFromResourceId(int resource_id);
26 26
27 protected: 27 protected:
28 virtual bool GetInitialVisibility() = 0; 28 virtual bool GetInitialVisibility() = 0;
29 29
30 // Overridden from SystemTrayItem. 30 // Overridden from SystemTrayItem.
31 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; 31 virtual views::View* CreateTrayView(user::LoginStatus status) override;
32 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 32 virtual views::View* CreateDefaultView(user::LoginStatus status) override;
33 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 33 virtual views::View* CreateDetailedView(user::LoginStatus status) override;
34 virtual void DestroyTrayView() OVERRIDE; 34 virtual void DestroyTrayView() override;
35 virtual void DestroyDefaultView() OVERRIDE; 35 virtual void DestroyDefaultView() override;
36 virtual void DestroyDetailedView() OVERRIDE; 36 virtual void DestroyDetailedView() override;
37 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; 37 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override;
38 virtual void UpdateAfterShelfAlignmentChange( 38 virtual void UpdateAfterShelfAlignmentChange(
39 ShelfAlignment alignment) OVERRIDE; 39 ShelfAlignment alignment) override;
40 40
41 private: 41 private:
42 // Set the alignment of the image depending on the shelf alignment. 42 // Set the alignment of the image depending on the shelf alignment.
43 void SetItemAlignment(ShelfAlignment alignment); 43 void SetItemAlignment(ShelfAlignment alignment);
44 44
45 int resource_id_; 45 int resource_id_;
46 TrayItemView* tray_view_; 46 TrayItemView* tray_view_;
47 47
48 DISALLOW_COPY_AND_ASSIGN(TrayImageItem); 48 DISALLOW_COPY_AND_ASSIGN(TrayImageItem);
49 }; 49 };
50 50
51 } // namespace ash 51 } // namespace ash
52 52
53 #endif // ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_ 53 #endif // ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_
OLDNEW
« no previous file with comments | « ash/system/tray/tray_event_filter.h ('k') | ash/system/tray/tray_item_more.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698