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

Side by Side Diff: ash/system/chromeos/rotation/tray_rotation_lock.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 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_CHROMEOS_ROTATION_TRAY_ROTATION_LOCK_H_ 5 #ifndef ASH_SYSTEM_CHROMEOS_ROTATION_TRAY_ROTATION_LOCK_H_
6 #define ASH_SYSTEM_CHROMEOS_ROTATION_TRAY_ROTATION_LOCK_H_ 6 #define ASH_SYSTEM_CHROMEOS_ROTATION_TRAY_ROTATION_LOCK_H_
7 7
8 #include "ash/shell_observer.h" 8 #include "ash/shell_observer.h"
9 #include "ash/system/tray/tray_image_item.h" 9 #include "ash/system/tray/tray_image_item.h"
10 #include "ash/wm/maximize_mode/maximize_mode_controller.h" 10 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
(...skipping 10 matching lines...) Expand all
21 // be interacted with, it toggles the state of the rotation lock. 21 // be interacted with, it toggles the state of the rotation lock.
22 // TrayRotationLock is only available on the primary display. 22 // TrayRotationLock is only available on the primary display.
23 class ASH_EXPORT TrayRotationLock : public TrayImageItem, 23 class ASH_EXPORT TrayRotationLock : public TrayImageItem,
24 public MaximizeModeController::Observer, 24 public MaximizeModeController::Observer,
25 public ShellObserver { 25 public ShellObserver {
26 public: 26 public:
27 explicit TrayRotationLock(SystemTray* system_tray); 27 explicit TrayRotationLock(SystemTray* system_tray);
28 virtual ~TrayRotationLock(); 28 virtual ~TrayRotationLock();
29 29
30 // MaximizeModeController::Observer: 30 // MaximizeModeController::Observer:
31 virtual void OnRotationLockChanged(bool rotation_locked) OVERRIDE; 31 virtual void OnRotationLockChanged(bool rotation_locked) override;
32 32
33 // SystemTrayItem: 33 // SystemTrayItem:
34 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 34 virtual views::View* CreateDefaultView(user::LoginStatus status) 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 protected: 40 protected:
41 // TrayImageItem: 41 // TrayImageItem:
42 virtual bool GetInitialVisibility() OVERRIDE; 42 virtual bool GetInitialVisibility() override;
43 43
44 private: 44 private:
45 friend class TrayRotationLockTest; 45 friend class TrayRotationLockTest;
46 46
47 // True if |on_primary_display_|, maximize mode is enabled, and rotation is 47 // True if |on_primary_display_|, maximize mode is enabled, and rotation is
48 // locked. 48 // locked.
49 bool ShouldBeVisible(); 49 bool ShouldBeVisible();
50 50
51 // True if this has been created by a SystemTray on the primary display. 51 // True if this has been created by a SystemTray on the primary display.
52 bool on_primary_display_; 52 bool on_primary_display_;
53 53
54 DISALLOW_COPY_AND_ASSIGN(TrayRotationLock); 54 DISALLOW_COPY_AND_ASSIGN(TrayRotationLock);
55 }; 55 };
56 56
57 } // namespace ash 57 } // namespace ash
58 58
59 #endif // ASH_SYSTEM_CHROMEOS_ROTATION_TRAY_ROTATION_LOCK_H_ 59 #endif // ASH_SYSTEM_CHROMEOS_ROTATION_TRAY_ROTATION_LOCK_H_
OLDNEW
« no previous file with comments | « ash/system/chromeos/power/video_activity_notifier.h ('k') | ash/system/chromeos/rotation/tray_rotation_lock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698