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

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

Issue 2925353002: Implement sync of keyboard layout between Ozone and Wayland clients (Closed)
Patch Set: Created 3 years, 6 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 (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_CAPS_LOCK_H_ 5 #ifndef ASH_SYSTEM_TRAY_CAPS_LOCK_H_
6 #define ASH_SYSTEM_TRAY_CAPS_LOCK_H_ 6 #define ASH_SYSTEM_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 "base/macros.h" 9 #include "base/macros.h"
10 #include "ui/base/ime/chromeos/ime_keyboard.h" 10 #include "ui/base/ime/chromeos/ime_keyboard.h"
11 #include "ui/events/event_handler.h" 11 #include "ui/events/event_handler.h"
12 12
13 namespace views { 13 namespace views {
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 ~TrayCapsLock() override; 24 ~TrayCapsLock() override;
25 25
26 private: 26 private:
27 // Overriden from chromeos::input_method::ImeKeyboard::Observer: 27 // Overriden from chromeos::input_method::ImeKeyboard::Observer:
28 void OnCapsLockChanged(bool enabled) override; 28 void OnCapsLockChanged(bool enabled) override;
29 29
30 // input_method::ImeKeyboard::Observer: we are not interested in layout:
reveman 2017/06/09 14:53:17 Simply "// Overridden from input_method::ImeKeyboa
jclinton 2017/06/09 16:36:02 Done.
31 void OnLayoutChanged(const std::string& layout_name) override{};
reveman 2017/06/09 14:53:17 nit: s/override{};/override {}/
jclinton 2017/06/09 16:36:02 Done.
32
30 // Overridden from TrayImageItem. 33 // Overridden from TrayImageItem.
31 bool GetInitialVisibility() override; 34 bool GetInitialVisibility() override;
32 views::View* CreateDefaultView(LoginStatus status) override; 35 views::View* CreateDefaultView(LoginStatus status) override;
33 void OnDefaultViewDestroyed() override; 36 void OnDefaultViewDestroyed() override;
34 37
35 CapsLockDefaultView* default_; 38 CapsLockDefaultView* default_;
36 39
37 bool caps_lock_enabled_; 40 bool caps_lock_enabled_;
38 bool message_shown_; 41 bool message_shown_;
39 42
40 DISALLOW_COPY_AND_ASSIGN(TrayCapsLock); 43 DISALLOW_COPY_AND_ASSIGN(TrayCapsLock);
41 }; 44 };
42 45
43 } // namespace ash 46 } // namespace ash
44 47
45 #endif // ASH_SYSTEM_TRAY_CAPS_LOCK_H_ 48 #endif // ASH_SYSTEM_TRAY_CAPS_LOCK_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698