Upstream version 9.38.198.0

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

diff --git a/src/chrome/browser/chromeos/events/keyboard_driven_event_rewriter.cc b/src/chrome/browser/chromeos/events/keyboard_driven_event_rewriter.cc
index fc11d98..1b33924 100644 (file)
--- a/src/chrome/browser/chromeos/events/keyboard_driven_event_rewriter.cc
+++ b/src/chrome/browser/chromeos/events/keyboard_driven_event_rewriter.cc
@@ -4,8 +4,9 @@
 
 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h"
 
-#include "chrome/browser/chromeos/login/users/user_manager.h"
+#include "chrome/browser/chromeos/events/event_rewriter.h"
 #include "chrome/browser/chromeos/system/input_device_settings.h"
+#include "components/user_manager/user_manager.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 
@@ -18,8 +19,8 @@ const int kModifierMask = ui::EF_SHIFT_DOWN;
 // Returns true if and only if it is on login screen (i.e. user is not logged
 // in) and the keyboard driven flag in the OEM manifest is on.
 bool ShouldStripModifiersForArrowKeysAndEnter() {
-  if (UserManager::IsInitialized() &&
-      !UserManager::Get()->IsSessionStarted()) {
+  if (user_manager::UserManager::IsInitialized() &&
+      !user_manager::UserManager::Get()->IsSessionStarted()) {
     return system::InputDeviceSettings::Get()
         ->ForceKeyboardDrivenUINavigation();
   }
@@ -77,9 +78,11 @@ ui::EventRewriteStatus KeyboardDrivenEventRewriter::Rewrite(
     return ui::EVENT_REWRITE_CONTINUE;
   }
 
-  rewritten_event->reset(new ui::KeyEvent(key_event));
-  (*rewritten_event)->set_flags(
-      flags & ~(ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN));
+  chromeos::EventRewriter::BuildRewrittenKeyEvent(
+      key_event,
+      key_event.key_code(),
+      flags & ~(ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN),
+      rewritten_event);
   return ui::EVENT_REWRITE_REWRITTEN;
 }