summaryrefslogtreecommitdiffstats
path: root/win8
diff options
context:
space:
mode:
Diffstat (limited to 'win8')
-rw-r--r--win8/metro_driver/chrome_app_view_ash.cc8
-rw-r--r--win8/metro_driver/metro_driver.gyp1
2 files changed, 5 insertions, 4 deletions
diff --git a/win8/metro_driver/chrome_app_view_ash.cc b/win8/metro_driver/chrome_app_view_ash.cc
index 776f23e..0660120 100644
--- a/win8/metro_driver/chrome_app_view_ash.cc
+++ b/win8/metro_driver/chrome_app_view_ash.cc
@@ -16,13 +16,13 @@
#include "base/path_service.h"
#include "base/single_thread_task_runner.h"
#include "base/win/metro.h"
-#include "base/win/win_util.h"
#include "base/win/windows_version.h"
#include "chrome/common/chrome_switches.h"
#include "ipc/ipc_channel.h"
#include "ipc/ipc_channel_proxy.h"
#include "ipc/ipc_sender.h"
#include "ui/events/gesture_detection/motion_event.h"
+#include "ui/events/win/system_event_state_lookup.h"
#include "ui/gfx/geometry/point_conversions.h"
#include "ui/gfx/win/dpi.h"
#include "ui/metro_viewer/metro_viewer_messages.h"
@@ -284,11 +284,11 @@ void RunMessageLoop(winui::Core::ICoreDispatcher* dispatcher) {
// Helper to return the state of the shift/control/alt keys.
uint32 GetKeyboardEventFlags() {
uint32 flags = 0;
- if (base::win::IsShiftPressed())
+ if (ui::win::IsShiftPressed())
flags |= ui::EF_SHIFT_DOWN;
- if (base::win::IsCtrlPressed())
+ if (ui::win::IsCtrlPressed())
flags |= ui::EF_CONTROL_DOWN;
- if (base::win::IsAltPressed())
+ if (ui::win::IsAltPressed())
flags |= ui::EF_ALT_DOWN;
return flags;
}
diff --git a/win8/metro_driver/metro_driver.gyp b/win8/metro_driver/metro_driver.gyp
index 2720bb5..b1c17fd 100644
--- a/win8/metro_driver/metro_driver.gyp
+++ b/win8/metro_driver/metro_driver.gyp
@@ -53,6 +53,7 @@
'../../crypto/crypto.gyp:crypto',
'../../ipc/ipc.gyp:ipc',
'../../sandbox/sandbox.gyp:sandbox',
+ '../../ui/events/events.gyp:events',
'../../ui/metro_viewer/metro_viewer.gyp:metro_viewer_messages',
'../../ui/gfx/gfx.gyp:gfx',
'../../ui/gfx/gfx.gyp:gfx_geometry',