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

Unified Diff: chromeos/ime/ime_keyboard_x11.h

Issue 689873004: Revert of Adds ozone support for ime keyboard. (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/ime/ime_keyboard_ozone.cc ('k') | chromeos/ime/ime_keyboard_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/ime/ime_keyboard_x11.h
diff --git a/chromeos/ime/ime_keyboard_x11.h b/chromeos/ime/ime_keyboard_x11.h
index 7548903cc7108ee3ef242a969bfd34894246288c..10ac01a1159c4e8b932cbf802426f5c71a44ed32 100644
--- a/chromeos/ime/ime_keyboard_x11.h
+++ b/chromeos/ime/ime_keyboard_x11.h
@@ -38,6 +38,10 @@
ImeKeyboardX11();
virtual ~ImeKeyboardX11();
+ // Adds/removes observer.
+ virtual void AddObserver(Observer* observer) override;
+ virtual void RemoveObserver(Observer* observer) override;
+
// ImeKeyboard:
virtual bool SetCurrentKeyboardLayoutByName(
const std::string& layout_name) override;
@@ -46,6 +50,8 @@
virtual void DisableNumLock() override;
virtual void SetCapsLockEnabled(bool enable_caps_lock) override;
virtual bool CapsLockIsEnabled() override;
+ virtual bool IsISOLevel5ShiftAvailable() const override;
+ virtual bool IsAltGrAvailable() const override;
virtual bool SetAutoRepeatEnabled(bool enabled) override;
virtual bool SetAutoRepeatRate(const AutoRepeatRate& rate) override;
@@ -75,12 +81,20 @@
const bool is_running_on_chrome_os_;
unsigned int num_lock_mask_;
+ // The current Caps Lock status. If true, enabled.
+ bool current_caps_lock_status_;
+
+ // The XKB layout name which we set last time like "us" and "us(dvorak)".
+ std::string current_layout_name_;
+
// A queue for executing setxkbmap one by one.
std::queue<std::string> execute_queue_;
base::ThreadChecker thread_checker_;
base::WeakPtrFactory<ImeKeyboardX11> weak_factory_;
+
+ ObserverList<Observer> observers_;
DISALLOW_COPY_AND_ASSIGN(ImeKeyboardX11);
};
« no previous file with comments | « chromeos/ime/ime_keyboard_ozone.cc ('k') | chromeos/ime/ime_keyboard_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698