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

Side by Side Diff: ash/system/chromeos/tray_caps_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
« no previous file with comments | « ash/system/chromeos/system_clock_observer.h ('k') | ash/system/chromeos/tray_caps_lock.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_CHROMEOS_TRAY_CAPS_LOCK_H_ 5 #ifndef ASH_SYSTEM_CHROMEOS_TRAY_CAPS_LOCK_H_
6 #define ASH_SYSTEM_CHROMEOS_TRAY_CAPS_LOCK_H_ 6 #define ASH_SYSTEM_CHROMEOS_TRAY_CAPS_LOCK_H_
7 7
8 #include "ash/system/tray/tray_image_item.h" 8 #include "ash/system/tray/tray_image_item.h"
9 #include "chromeos/ime/ime_keyboard.h" 9 #include "chromeos/ime/ime_keyboard.h"
10 #include "ui/events/event_handler.h" 10 #include "ui/events/event_handler.h"
11 11
12 namespace views { 12 namespace views {
13 class ImageView; 13 class ImageView;
14 class View; 14 class View;
15 } 15 }
16 16
17 namespace ash { 17 namespace ash {
18 class CapsLockDefaultView; 18 class CapsLockDefaultView;
19 19
20 class TrayCapsLock : public TrayImageItem, 20 class TrayCapsLock : public TrayImageItem,
21 public chromeos::input_method::ImeKeyboard::Observer { 21 public chromeos::input_method::ImeKeyboard::Observer {
22 public: 22 public:
23 explicit TrayCapsLock(SystemTray* system_tray); 23 explicit TrayCapsLock(SystemTray* system_tray);
24 virtual ~TrayCapsLock(); 24 virtual ~TrayCapsLock();
25 25
26 private: 26 private:
27 // Overriden from chromeos::input_method::ImeKeyboard::Observer: 27 // Overriden from chromeos::input_method::ImeKeyboard::Observer:
28 virtual void OnCapsLockChanged(bool enabled) OVERRIDE; 28 virtual void OnCapsLockChanged(bool enabled) override;
29 29
30 // Overridden from TrayImageItem. 30 // Overridden from TrayImageItem.
31 virtual bool GetInitialVisibility() OVERRIDE; 31 virtual bool GetInitialVisibility() 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 DestroyDefaultView() OVERRIDE; 34 virtual void DestroyDefaultView() override;
35 virtual void DestroyDetailedView() OVERRIDE; 35 virtual void DestroyDetailedView() override;
36 36
37 CapsLockDefaultView* default_; 37 CapsLockDefaultView* default_;
38 views::View* detailed_; 38 views::View* detailed_;
39 39
40 bool caps_lock_enabled_; 40 bool caps_lock_enabled_;
41 bool message_shown_; 41 bool message_shown_;
42 42
43 DISALLOW_COPY_AND_ASSIGN(TrayCapsLock); 43 DISALLOW_COPY_AND_ASSIGN(TrayCapsLock);
44 }; 44 };
45 45
46 } // namespace ash 46 } // namespace ash
47 47
48 #endif // ASH_SYSTEM_CHROMEOS_TRAY_CAPS_LOCK_H_ 48 #endif // ASH_SYSTEM_CHROMEOS_TRAY_CAPS_LOCK_H_
OLDNEW
« no previous file with comments | « ash/system/chromeos/system_clock_observer.h ('k') | ash/system/chromeos/tray_caps_lock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698