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

Side by Side Diff: ash/system/tray/tray_details_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_bubble_wrapper.h ('k') | ash/system/tray/tray_details_view.cc » ('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_DETAILS_VIEW_H_ 5 #ifndef ASH_SYSTEM_TRAY_TRAY_DETAILS_VIEW_H_
6 #define ASH_SYSTEM_TRAY_TRAY_DETAILS_VIEW_H_ 6 #define ASH_SYSTEM_TRAY_TRAY_DETAILS_VIEW_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/system/tray/special_popup_row.h" 9 #include "ash/system/tray/special_popup_row.h"
10 #include "ui/views/view.h" 10 #include "ui/views/view.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 // view. 43 // view.
44 void TransitionToDefaultView(); 44 void TransitionToDefaultView();
45 45
46 SystemTrayItem* owner() const { return owner_; } 46 SystemTrayItem* owner() const { return owner_; }
47 SpecialPopupRow* footer() const { return footer_; } 47 SpecialPopupRow* footer() const { return footer_; }
48 FixedSizedScrollView* scroller() const { return scroller_; } 48 FixedSizedScrollView* scroller() const { return scroller_; }
49 views::View* scroll_content() const { return scroll_content_; } 49 views::View* scroll_content() const { return scroll_content_; }
50 50
51 protected: 51 protected:
52 // Overridden from views::View. 52 // Overridden from views::View.
53 virtual void Layout() OVERRIDE; 53 virtual void Layout() override;
54 virtual void OnPaintBorder(gfx::Canvas* canvas) OVERRIDE; 54 virtual void OnPaintBorder(gfx::Canvas* canvas) override;
55 55
56 private: 56 private:
57 SystemTrayItem* owner_; 57 SystemTrayItem* owner_;
58 SpecialPopupRow* footer_; 58 SpecialPopupRow* footer_;
59 FixedSizedScrollView* scroller_; 59 FixedSizedScrollView* scroller_;
60 views::View* scroll_content_; 60 views::View* scroll_content_;
61 ScrollBorder* scroll_border_; // Weak reference 61 ScrollBorder* scroll_border_; // Weak reference
62 62
63 DISALLOW_COPY_AND_ASSIGN(TrayDetailsView); 63 DISALLOW_COPY_AND_ASSIGN(TrayDetailsView);
64 }; 64 };
65 65
66 } // namespace ash 66 } // namespace ash
67 67
68 #endif // ASH_SYSTEM_TRAY_TRAY_DETAILS_VIEW_H_ 68 #endif // ASH_SYSTEM_TRAY_TRAY_DETAILS_VIEW_H_
OLDNEW
« no previous file with comments | « ash/system/tray/tray_bubble_wrapper.h ('k') | ash/system/tray/tray_details_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698