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

Side by Side Diff: ash/system/tray/special_popup_row.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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_SPECIAL_POPUP_ROW_H_ 5 #ifndef ASH_SYSTEM_TRAY_SPECIAL_POPUP_ROW_H_
6 #define ASH_SYSTEM_TRAY_SPECIAL_POPUP_ROW_H_ 6 #define ASH_SYSTEM_TRAY_SPECIAL_POPUP_ROW_H_
7 7
8 #include "ui/gfx/size.h" 8 #include "ui/gfx/size.h"
9 #include "ui/views/view.h" 9 #include "ui/views/view.h"
10 10
(...skipping 17 matching lines...) Expand all
28 void SetTextLabel(int string_id, ViewClickListener* listener); 28 void SetTextLabel(int string_id, ViewClickListener* listener);
29 void SetContent(views::View* view); 29 void SetContent(views::View* view);
30 30
31 void AddButton(TrayPopupHeaderButton* button); 31 void AddButton(TrayPopupHeaderButton* button);
32 void AddThrobber(ThrobberView* throbber); 32 void AddThrobber(ThrobberView* throbber);
33 33
34 views::View* content() const { return content_; } 34 views::View* content() const { return content_; }
35 35
36 private: 36 private:
37 // Overridden from views::View. 37 // Overridden from views::View.
38 virtual gfx::Size GetPreferredSize() const OVERRIDE; 38 virtual gfx::Size GetPreferredSize() const override;
39 virtual int GetHeightForWidth(int width) const OVERRIDE; 39 virtual int GetHeightForWidth(int width) const override;
40 virtual void Layout() OVERRIDE; 40 virtual void Layout() override;
41 41
42 views::View* content_; 42 views::View* content_;
43 views::View* button_container_; 43 views::View* button_container_;
44 views::Label* text_label_; 44 views::Label* text_label_;
45 45
46 DISALLOW_COPY_AND_ASSIGN(SpecialPopupRow); 46 DISALLOW_COPY_AND_ASSIGN(SpecialPopupRow);
47 }; 47 };
48 48
49 } // namespace ash 49 } // namespace ash
50 50
51 #endif // ASH_SYSTEM_TRAY_SPECIAL_POPUP_ROW_H_ 51 #endif // ASH_SYSTEM_TRAY_SPECIAL_POPUP_ROW_H_
OLDNEW
« no previous file with comments | « ash/system/tray/media_security/multi_profile_media_tray_item.cc ('k') | ash/system/tray/system_tray.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698