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

Side by Side Diff: ash/system/overview/overview_button_tray.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/locale/locale_notification_controller.cc ('k') | ash/system/status_area_widget.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_ 5 #ifndef ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_
6 #define ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_ 6 #define ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/shell_observer.h" 9 #include "ash/shell_observer.h"
10 #include "ash/system/tray/tray_background_view.h" 10 #include "ash/system/tray/tray_background_view.h"
(...skipping 13 matching lines...) Expand all
24 public ShellObserver { 24 public ShellObserver {
25 public: 25 public:
26 explicit OverviewButtonTray(StatusAreaWidget* status_area_widget); 26 explicit OverviewButtonTray(StatusAreaWidget* status_area_widget);
27 virtual ~OverviewButtonTray(); 27 virtual ~OverviewButtonTray();
28 28
29 // Updates the tray's visibility based on the LoginStatus and the current 29 // Updates the tray's visibility based on the LoginStatus and the current
30 // state of MaximizeMode 30 // state of MaximizeMode
31 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status); 31 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status);
32 32
33 // ActionableView: 33 // ActionableView:
34 virtual bool PerformAction(const ui::Event& event) OVERRIDE; 34 virtual bool PerformAction(const ui::Event& event) override;
35 35
36 // ShellObserver: 36 // ShellObserver:
37 virtual void OnMaximizeModeStarted() OVERRIDE; 37 virtual void OnMaximizeModeStarted() override;
38 virtual void OnMaximizeModeEnded() OVERRIDE; 38 virtual void OnMaximizeModeEnded() override;
39 39
40 // TrayBackgroundView: 40 // TrayBackgroundView:
41 virtual bool ClickedOutsideBubble() OVERRIDE; 41 virtual bool ClickedOutsideBubble() override;
42 virtual base::string16 GetAccessibleNameForTray() OVERRIDE; 42 virtual base::string16 GetAccessibleNameForTray() override;
43 virtual void HideBubbleWithView( 43 virtual void HideBubbleWithView(
44 const views::TrayBubbleView* bubble_view) OVERRIDE; 44 const views::TrayBubbleView* bubble_view) override;
45 virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE; 45 virtual void SetShelfAlignment(ShelfAlignment alignment) override;
46 46
47 private: 47 private:
48 friend class OverviewButtonTrayTest; 48 friend class OverviewButtonTrayTest;
49 49
50 // Creates a new border for the icon. The padding is determined based on the 50 // Creates a new border for the icon. The padding is determined based on the
51 // alignment of the shelf. 51 // alignment of the shelf.
52 void SetIconBorderForShelfAlignment(); 52 void SetIconBorderForShelfAlignment();
53 53
54 // Sets the icon to visible if maximize mode is enabled and 54 // Sets the icon to visible if maximize mode is enabled and
55 // WindowSelectorController::CanSelect. 55 // WindowSelectorController::CanSelect.
56 void UpdateIconVisibility(); 56 void UpdateIconVisibility();
57 57
58 // Weak pointer, will be parented by TrayContainer for its lifetime. 58 // Weak pointer, will be parented by TrayContainer for its lifetime.
59 views::ImageView* icon_; 59 views::ImageView* icon_;
60 60
61 DISALLOW_COPY_AND_ASSIGN(OverviewButtonTray); 61 DISALLOW_COPY_AND_ASSIGN(OverviewButtonTray);
62 }; 62 };
63 63
64 } // namespace ash 64 } // namespace ash
65 65
66 #endif // ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_ 66 #endif // ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_
OLDNEW
« no previous file with comments | « ash/system/locale/locale_notification_controller.cc ('k') | ash/system/status_area_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698