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

Side by Side Diff: ash/system/chromeos/tray_caps_lock.h

Issue 231753002: Fixing caps lock problems under ChromeOS where the tray does not properly follow the real caps lock… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
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 "ui/events/event_handler.h" 9 #include "chromeos/ime/xkeyboard.h"
10 10
11 namespace views { 11 namespace views {
12 class ImageView; 12 class ImageView;
13 class View; 13 class View;
14 } 14 }
15 15
16 namespace ash { 16 namespace ash {
17 class CapsLockDefaultView; 17 class CapsLockDefaultView;
18 18
19 class TrayCapsLock : public TrayImageItem, 19 class TrayCapsLock : public TrayImageItem,
20 public ui::EventHandler { 20 public chromeos::input_method::XKeyboard::Observer {
21 public: 21 public:
22 explicit TrayCapsLock(SystemTray* system_tray); 22 explicit TrayCapsLock(SystemTray* system_tray);
23 virtual ~TrayCapsLock(); 23 virtual ~TrayCapsLock();
24 24
25 private: 25 private:
26 void OnCapsLockChanged(bool enabled); 26 // Overriden from chromeos::input_method::XKeyboard::Observer:
27 27 virtual void OnCapsLockChanged() OVERRIDE;
28 // ui::EventHandler:
29 virtual void OnKeyEvent(ui::KeyEvent* key) OVERRIDE;
30 28
31 // Overridden from TrayImageItem. 29 // Overridden from TrayImageItem.
32 virtual bool GetInitialVisibility() OVERRIDE; 30 virtual bool GetInitialVisibility() OVERRIDE;
33 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 31 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
34 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 32 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
35 virtual void DestroyDefaultView() OVERRIDE; 33 virtual void DestroyDefaultView() OVERRIDE;
36 virtual void DestroyDetailedView() OVERRIDE; 34 virtual void DestroyDetailedView() OVERRIDE;
37 35
38 CapsLockDefaultView* default_; 36 CapsLockDefaultView* default_;
39 views::View* detailed_; 37 views::View* detailed_;
40 38
41 bool caps_lock_enabled_; 39 bool caps_lock_enabled_;
42 bool message_shown_; 40 bool message_shown_;
43 41
44 DISALLOW_COPY_AND_ASSIGN(TrayCapsLock); 42 DISALLOW_COPY_AND_ASSIGN(TrayCapsLock);
45 }; 43 };
46 44
47 } // namespace ash 45 } // namespace ash
48 46
49 #endif // ASH_SYSTEM_CHROMEOS_TRAY_CAPS_LOCK_H_ 47 #endif // ASH_SYSTEM_CHROMEOS_TRAY_CAPS_LOCK_H_
OLDNEW
« no previous file with comments | « no previous file | ash/system/chromeos/tray_caps_lock.cc » ('j') | ash/system/chromeos/tray_caps_lock.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698