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

Unified Diff: chrome/browser/chromeos/system_key_event_listener.cc

Issue 9264004: Make almost all public functions in XKeyboard pure virtual (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 11 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 | « chrome/browser/chromeos/system_key_event_listener.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/system_key_event_listener.cc
diff --git a/chrome/browser/chromeos/system_key_event_listener.cc b/chrome/browser/chromeos/system_key_event_listener.cc
index 6740eafb5f2e9bb1feda7c279dae6ac7720d4b37..09d5a7bc28a37ae9039e3e1006871400e2cbea82 100644
--- a/chrome/browser/chromeos/system_key_event_listener.cc
+++ b/chrome/browser/chromeos/system_key_event_listener.cc
@@ -76,10 +76,12 @@ SystemKeyEventListener* SystemKeyEventListener::GetInstance() {
SystemKeyEventListener::SystemKeyEventListener()
: stopped_(false),
- num_lock_mask_(input_method::XKeyboard::GetNumLockMask()),
+ num_lock_mask_(0),
xkb_event_base_(0) {
- input_method::XKeyboard::GetLockedModifiers(
- num_lock_mask_, &caps_lock_is_on_, &num_lock_is_on_);
+ input_method::XKeyboard* xkeyboard =
+ input_method::InputMethodManager::GetInstance()->GetXKeyboard();
+ num_lock_mask_ = xkeyboard->GetNumLockMask();
+ xkeyboard->GetLockedModifiers(&caps_lock_is_on_, &num_lock_is_on_);
Display* display = ui::GetXDisplay();
key_brightness_down_ = XKeysymToKeycode(display,
« no previous file with comments | « chrome/browser/chromeos/system_key_event_listener.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698