Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / events / system_key_event_listener.cc

diff --git a/src/chrome/browser/chromeos/events/system_key_event_listener.cc b/src/chrome/browser/chromeos/events/system_key_event_listener.cc
index e7f8175..7ce4f5e 100644 (file)
--- a/src/chrome/browser/chromeos/events/system_key_event_listener.cc
+++ b/src/chrome/browser/chromeos/events/system_key_event_listener.cc
@@ -10,10 +10,10 @@
 #include <X11/XKBlib.h>
 #undef Status
 
-#include "base/message_loop/message_loop.h"
+#include "chromeos/ime/ime_keyboard.h"
 #include "chromeos/ime/input_method_manager.h"
-#include "chromeos/ime/xkeyboard.h"
 #include "ui/base/x/x11_util.h"
+#include "ui/events/platform/platform_event_source.h"
 
 namespace chromeos {
 
@@ -62,7 +62,7 @@ SystemKeyEventListener::SystemKeyEventListener()
     LOG(WARNING) << "Could not install Xkb Indicator observer";
   }
 
-  base::MessageLoopForUI::current()->AddObserver(this);
+  ui::PlatformEventSource::GetInstance()->AddPlatformEventObserver(this);
 }
 
 SystemKeyEventListener::~SystemKeyEventListener() {
@@ -72,19 +72,18 @@ SystemKeyEventListener::~SystemKeyEventListener() {
 void SystemKeyEventListener::Stop() {
   if (stopped_)
     return;
-  base::MessageLoopForUI::current()->RemoveObserver(this);
+  ui::PlatformEventSource::GetInstance()->RemovePlatformEventObserver(this);
   stopped_ = true;
 }
 
-base::EventStatus SystemKeyEventListener::WillProcessEvent(
-    const base::NativeEvent& event) {
-  return ProcessedXEvent(event) ? base::EVENT_HANDLED : base::EVENT_CONTINUE;
+void SystemKeyEventListener::WillProcessEvent(const base::NativeEvent& event) {
+  ProcessedXEvent(event);
 }
 
 void SystemKeyEventListener::DidProcessEvent(const base::NativeEvent& event) {
 }
 
-bool SystemKeyEventListener::ProcessedXEvent(XEvent* xevent) {
+void SystemKeyEventListener::ProcessedXEvent(XEvent* xevent) {
   input_method::InputMethodManager* input_method_manager =
       input_method::InputMethodManager::Get();
 
@@ -95,12 +94,10 @@ bool SystemKeyEventListener::ProcessedXEvent(XEvent* xevent) {
       if (xkey_event->state.mods) {
         // TODO(yusukes,adlr): Let the user know that num lock is unsupported.
         // Force turning off Num Lock (crosbug.com/29169)
-        input_method_manager->GetXKeyboard()->DisableNumLock();
+        input_method_manager->GetImeKeyboard()->DisableNumLock();
       }
-      return true;
     }
   }
-  return false;
 }
 
 }  // namespace chromeos