Index: chrome/browser/chromeos/events/system_key_event_listener.cc |
diff --git a/chrome/browser/chromeos/events/system_key_event_listener.cc b/chrome/browser/chromeos/events/system_key_event_listener.cc |
index b741c16c860aa772e5a03f0541e0bbbbc64da8d2..70202af62fc9488d77f7be835c9d1e85c94319fa 100644 |
--- a/chrome/browser/chromeos/events/system_key_event_listener.cc |
+++ b/chrome/browser/chromeos/events/system_key_event_listener.cc |
@@ -44,7 +44,6 @@ SystemKeyEventListener* SystemKeyEventListener::GetInstance() { |
SystemKeyEventListener::SystemKeyEventListener() |
: stopped_(false), |
num_lock_mask_(0), |
- pressed_modifiers_(0), |
xkb_event_base_(0) { |
input_method::XKeyboard* xkeyboard = |
input_method::InputMethodManager::Get()->GetXKeyboard(); |
@@ -87,20 +86,11 @@ void SystemKeyEventListener::AddCapsLockObserver(CapsLockObserver* observer) { |
caps_lock_observers_.AddObserver(observer); |
} |
-void SystemKeyEventListener::AddModifiersObserver(ModifiersObserver* observer) { |
- modifiers_observers_.AddObserver(observer); |
-} |
- |
void SystemKeyEventListener::RemoveCapsLockObserver( |
CapsLockObserver* observer) { |
caps_lock_observers_.RemoveObserver(observer); |
} |
-void SystemKeyEventListener::RemoveModifiersObserver( |
- ModifiersObserver* observer) { |
- modifiers_observers_.RemoveObserver(observer); |
-} |
- |
base::EventStatus SystemKeyEventListener::WillProcessEvent( |
const base::NativeEvent& event) { |
return ProcessedXEvent(event) ? base::EVENT_HANDLED : base::EVENT_CONTINUE; |
@@ -115,12 +105,6 @@ void SystemKeyEventListener::OnCapsLock(bool enabled) { |
OnCapsLockChange(enabled)); |
} |
-void SystemKeyEventListener::OnModifiers(int state) { |
- FOR_EACH_OBSERVER(ModifiersObserver, |
- modifiers_observers_, |
- OnModifiersChange(state)); |
-} |
- |
bool SystemKeyEventListener::ProcessedXEvent(XEvent* xevent) { |
input_method::InputMethodManager* input_method_manager = |
input_method::InputMethodManager::Get(); |
@@ -141,17 +125,6 @@ bool SystemKeyEventListener::ProcessedXEvent(XEvent* xevent) { |
input_method::kDontChange /* caps lock */, |
input_method::kDisableLock /* num lock */); |
} |
- int current_modifiers = 0; |
- if (xkey_event->state.mods & ShiftMask) |
- current_modifiers |= ModifiersObserver::SHIFT_PRESSED; |
- if (xkey_event->state.mods & ControlMask) |
- current_modifiers |= ModifiersObserver::CTRL_PRESSED; |
- if (xkey_event->state.mods & Mod1Mask) |
- current_modifiers |= ModifiersObserver::ALT_PRESSED; |
- if (current_modifiers != pressed_modifiers_) { |
- pressed_modifiers_ = current_modifiers; |
- OnModifiers(pressed_modifiers_); |
- } |
return true; |
} |
} |