summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/test/remoting/key_code_map.h2
-rw-r--r--content/content_renderer.gypi2
-rw-r--r--content/content_tests.gypi2
-rw-r--r--content/public/test/browser_test_utils.cc2
-rw-r--r--content/renderer/pepper/usb_key_code_conversion_linux.cc2
-rw-r--r--content/renderer/pepper/usb_key_code_conversion_mac.cc2
-rw-r--r--content/renderer/pepper/usb_key_code_conversion_win.cc2
-rw-r--r--remoting/host/input_injector_linux.cc6
-rw-r--r--remoting/host/input_injector_mac.cc4
-rw-r--r--remoting/host/input_injector_win.cc4
-rw-r--r--remoting/remoting.gyp2
-rw-r--r--ui/events/events.gyp13
-rw-r--r--ui/events/keycodes/OWNERS (renamed from ui/base/keycodes/OWNERS)0
-rw-r--r--ui/events/keycodes/dom4/keycode_converter.cc (renamed from ui/base/keycodes/keycode_converter.cc)6
-rw-r--r--ui/events/keycodes/dom4/keycode_converter.h (renamed from ui/base/keycodes/keycode_converter.h)8
-rw-r--r--ui/events/keycodes/dom4/keycode_converter_data.h (renamed from ui/base/keycodes/keycode_converter_data.h)8
-rw-r--r--ui/events/keycodes/dom4/keycode_converter_unittest.cc (renamed from ui/base/keycodes/keycode_converter_unittest.cc)4
-rw-r--r--ui/ui.gyp12
-rw-r--r--ui/ui_unittests.gyp4
19 files changed, 43 insertions, 42 deletions
diff --git a/chrome/test/remoting/key_code_map.h b/chrome/test/remoting/key_code_map.h
index 2cda3ef..5bdb238 100644
--- a/chrome/test/remoting/key_code_map.h
+++ b/chrome/test/remoting/key_code_map.h
@@ -3,7 +3,7 @@
// found in the LICENSE file.
// Source of data in this file:
-// 1. ui/base/keycodes/keycode_converter_data.h
+// 1. ui/events/keycodes/dom4/keycode_converter_data.h
// 2. ui/events/keycodes/keyboard_codes.h
// 3. third_party/WebKit/Source/core/platform/chromium/KeyboardCodes.h
#ifndef CHROME_TEST_REMOTING_KEY_CODE_MAP_H_
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 9bb938a..659c662 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -14,9 +14,9 @@
'../third_party/libjingle/libjingle.gyp:libjingle',
'../third_party/npapi/npapi.gyp:npapi',
'../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
+ '../ui/events/events.gyp:dom4_keycode_converter',
'../ui/native_theme/native_theme.gyp:native_theme',
'../ui/surface/surface.gyp:surface',
- '../ui/ui.gyp:keycode_converter',
'../v8/tools/gyp/v8.gyp:v8',
'../webkit/child/webkit_child.gyp:webkit_child',
'../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 50b21a3..4e5fa5f 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -12,10 +12,10 @@
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
+ '../ui/events/events.gyp:dom4_keycode_converter',
'../ui/events/events.gyp:events_base',
'../ui/gfx/gfx.gyp:gfx',
'../ui/resources/ui_resources.gyp:ui_resources',
- '../ui/ui.gyp:keycode_converter',
'../ui/ui.gyp:ui',
'../ui/ui_unittests.gyp:ui_test_support',
'../url/url.gyp:url_lib',
diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc
index b18be14..3894421 100644
--- a/content/public/test/browser_test_utils.cc
+++ b/content/public/test/browser_test_utils.cc
@@ -31,8 +31,8 @@
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/keycodes/keycode_converter.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/events/keycodes/dom4/keycode_converter.h"
namespace content {
namespace {
diff --git a/content/renderer/pepper/usb_key_code_conversion_linux.cc b/content/renderer/pepper/usb_key_code_conversion_linux.cc
index 7c12b61..8b9a4a5 100644
--- a/content/renderer/pepper/usb_key_code_conversion_linux.cc
+++ b/content/renderer/pepper/usb_key_code_conversion_linux.cc
@@ -6,7 +6,7 @@
#include "base/basictypes.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
-#include "ui/base/keycodes/keycode_converter.h"
+#include "ui/events/keycodes/dom4/keycode_converter.h"
using blink::WebKeyboardEvent;
diff --git a/content/renderer/pepper/usb_key_code_conversion_mac.cc b/content/renderer/pepper/usb_key_code_conversion_mac.cc
index 4a02d7b..c701b48 100644
--- a/content/renderer/pepper/usb_key_code_conversion_mac.cc
+++ b/content/renderer/pepper/usb_key_code_conversion_mac.cc
@@ -6,7 +6,7 @@
#include "base/basictypes.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
-#include "ui/base/keycodes/keycode_converter.h"
+#include "ui/events/keycodes/dom4/keycode_converter.h"
using blink::WebKeyboardEvent;
diff --git a/content/renderer/pepper/usb_key_code_conversion_win.cc b/content/renderer/pepper/usb_key_code_conversion_win.cc
index 17cad77..21c26ab 100644
--- a/content/renderer/pepper/usb_key_code_conversion_win.cc
+++ b/content/renderer/pepper/usb_key_code_conversion_win.cc
@@ -6,7 +6,7 @@
#include "base/basictypes.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
-#include "ui/base/keycodes/keycode_converter.h"
+#include "ui/events/keycodes/dom4/keycode_converter.h"
using blink::WebKeyboardEvent;
diff --git a/remoting/host/input_injector_linux.cc b/remoting/host/input_injector_linux.cc
index b109b77..678216d 100644
--- a/remoting/host/input_injector_linux.cc
+++ b/remoting/host/input_injector_linux.cc
@@ -4,9 +4,9 @@
#include "remoting/host/input_injector.h"
-#include <X11/Xlib.h>
-#include <X11/extensions/XTest.h>
#include <X11/extensions/XInput.h>
+#include <X11/extensions/XTest.h>
+#include <X11/Xlib.h>
#include <set>
@@ -19,7 +19,7 @@
#include "remoting/host/clipboard.h"
#include "remoting/proto/internal.pb.h"
#include "third_party/skia/include/core/SkPoint.h"
-#include "ui/base/keycodes/keycode_converter.h"
+#include "ui/events/keycodes/dom4/keycode_converter.h"
namespace remoting {
diff --git a/remoting/host/input_injector_mac.cc b/remoting/host/input_injector_mac.cc
index 6ea7467..009a41f 100644
--- a/remoting/host/input_injector_mac.cc
+++ b/remoting/host/input_injector_mac.cc
@@ -4,9 +4,9 @@
#include "remoting/host/input_injector.h"
-#include <algorithm>
#include <ApplicationServices/ApplicationServices.h>
#include <Carbon/Carbon.h>
+#include <algorithm>
#include "base/basictypes.h"
#include "base/bind.h"
@@ -22,7 +22,7 @@
#include "third_party/skia/include/core/SkPoint.h"
#include "third_party/skia/include/core/SkRect.h"
#include "third_party/webrtc/modules/desktop_capture/mac/desktop_configuration.h"
-#include "ui/base/keycodes/keycode_converter.h"
+#include "ui/events/keycodes/dom4/keycode_converter.h"
namespace remoting {
diff --git a/remoting/host/input_injector_win.cc b/remoting/host/input_injector_win.cc
index c2ac2c1..2d1524f9b 100644
--- a/remoting/host/input_injector_win.cc
+++ b/remoting/host/input_injector_win.cc
@@ -15,9 +15,9 @@
#include "remoting/host/clipboard.h"
#include "remoting/proto/event.pb.h"
// SkSize.h assumes that stdint.h-style types are already defined.
-#include "third_party/skia/include/core/SkTypes.h"
#include "third_party/skia/include/core/SkSize.h"
-#include "ui/base/keycodes/keycode_converter.h"
+#include "third_party/skia/include/core/SkTypes.h"
+#include "ui/events/keycodes/dom4/keycode_converter.h"
namespace remoting {
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index fb3eb93..9359095 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -275,7 +275,7 @@
'../google_apis/google_apis.gyp:google_apis',
'../ipc/ipc.gyp:ipc',
'../third_party/webrtc/modules/modules.gyp:desktop_capture',
- '../ui/ui.gyp:keycode_converter',
+ '../ui/events/events.gyp:dom4_keycode_converter',
],
'defines': [
'VERSION=<(version_full)',
diff --git a/ui/events/events.gyp b/ui/events/events.gyp
index 9176ffd..8e96748 100644
--- a/ui/events/events.gyp
+++ b/ui/events/events.gyp
@@ -8,11 +8,24 @@
},
'targets': [
{
+ 'target_name': 'dom4_keycode_converter',
+ 'type': 'static_library',
+ 'dependencies': [
+ '<(DEPTH)/base/base.gyp:base',
+ ],
+ 'sources': [
+ 'keycodes/dom4/keycode_converter.cc',
+ 'keycodes/dom4/keycode_converter.h',
+ 'keycodes/dom4/keycode_converter_data.h',
+ ],
+ },
+ {
'target_name': 'events_base',
'type': '<(component)',
'dependencies': [
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ 'dom4_keycode_converter',
],
'defines': [
'EVENTS_BASE_IMPLEMENTATION',
diff --git a/ui/base/keycodes/OWNERS b/ui/events/keycodes/OWNERS
index a49314c..a49314c 100644
--- a/ui/base/keycodes/OWNERS
+++ b/ui/events/keycodes/OWNERS
diff --git a/ui/base/keycodes/keycode_converter.cc b/ui/events/keycodes/dom4/keycode_converter.cc
index a7010aa..b3693c8 100644
--- a/ui/base/keycodes/keycode_converter.cc
+++ b/ui/events/keycodes/dom4/keycode_converter.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/base/keycodes/keycode_converter.h"
+#include "ui/events/keycodes/dom4/keycode_converter.h"
namespace ui {
@@ -17,7 +17,7 @@ namespace {
#else
#define USB_KEYMAP(usb, xkb, win, mac, code) {usb, 0, code}
#endif
-#include "ui/base/keycodes/keycode_converter_data.h"
+#include "ui/events/keycodes/dom4/keycode_converter_data.h"
const size_t kKeycodeMapEntries = arraysize(usb_keycode_map);
diff --git a/ui/base/keycodes/keycode_converter.h b/ui/events/keycodes/dom4/keycode_converter.h
index cd9ac43..67d64b5 100644
--- a/ui/base/keycodes/keycode_converter.h
+++ b/ui/events/keycodes/dom4/keycode_converter.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_BASE_KEYCODES_KEYCODE_CONVERTER_H_
-#define UI_BASE_KEYCODES_KEYCODE_CONVERTER_H_
+#ifndef UI_EVENTS_KEYCODES_DOM4_KEYCODE_CONVERTER_H_
+#define UI_EVENTS_KEYCODES_DOM4_KEYCODE_CONVERTER_H_
#include <stdint.h>
#include "base/basictypes.h"
@@ -84,4 +84,4 @@ class KeycodeConverter {
} // namespace ui
-#endif // UI_BASE_KEYCODE_CONVERTER_H_
+#endif // UI_EVENTS_KEYCODES_DOM4_KEYCODE_CONVERTER_H_
diff --git a/ui/base/keycodes/keycode_converter_data.h b/ui/events/keycodes/dom4/keycode_converter_data.h
index d7788e5..9cdeb5f 100644
--- a/ui/base/keycodes/keycode_converter_data.h
+++ b/ui/events/keycodes/dom4/keycode_converter_data.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_BASE_KEYCODES_KEYCODE_CONVERTER_DATA_H_
-#define UI_BASE_KEYCODES_KEYCODE_CONVERTER_DATA_H_
+#ifndef UI_EVENTS_KEYCODES_DOM4_KEYCODE_CONVERTER_DATA_H_
+#define UI_EVENTS_KEYCODES_DOM4_KEYCODE_CONVERTER_DATA_H_
// Data in this file was created by referencing:
// USB HID Usage Tables (v1.11) 27 June 2001
@@ -376,4 +376,4 @@ const KeycodeMapEntry usb_keycode_map[] = {
USB_KEYMAP(0x0c028c, 0x00ef, 0x0000, 0xffff, NULL), // AC_Send
};
-#endif // UI_BASE_KEYCODES_KEYCODE_CONVERTER_DATA_H_
+#endif // UI_EVENTS_KEYCODES_DOM4_KEYCODE_CONVERTER_DATA_H_
diff --git a/ui/base/keycodes/keycode_converter_unittest.cc b/ui/events/keycodes/dom4/keycode_converter_unittest.cc
index 3362d53..a8fd5bf 100644
--- a/ui/base/keycodes/keycode_converter_unittest.cc
+++ b/ui/events/keycodes/dom4/keycode_converter_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/base/keycodes/keycode_converter.h"
+#include "ui/events/keycodes/dom4/keycode_converter.h"
#include <map>
diff --git a/ui/ui.gyp b/ui/ui.gyp
index d8adf59..01a1867 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -611,18 +611,6 @@
]
}
},
- {
- 'target_name': 'keycode_converter',
- 'type': 'static_library',
- 'dependencies': [
- '../base/base.gyp:base',
- ],
- 'sources': [
- 'base/keycodes/keycode_converter.cc',
- 'base/keycodes/keycode_converter.h',
- 'base/keycodes/keycode_converter_data.h',
- ],
- }
],
'conditions': [
['OS=="android"' , {
diff --git a/ui/ui_unittests.gyp b/ui/ui_unittests.gyp
index 5ce67c2..1739db2 100644
--- a/ui/ui_unittests.gyp
+++ b/ui/ui_unittests.gyp
@@ -92,11 +92,11 @@
'../third_party/libpng/libpng.gyp:libpng',
'../url/url.gyp:url_lib',
'base/strings/ui_strings.gyp:ui_strings',
+ 'events/events.gyp:dom4_keycode_converter',
'events/events.gyp:events_base',
'resources/ui_resources.gyp:ui_resources',
'run_ui_unittests',
'shell_dialogs/shell_dialogs.gyp:shell_dialogs',
- 'ui.gyp:keycode_converter',
'ui.gyp:ui',
'ui_test_support',
],
@@ -166,7 +166,6 @@
'base/cocoa/tracking_area_unittest.mm',
'base/dragdrop/os_exchange_data_provider_aurax11_unittest.cc',
'base/gtk/gtk_expanded_container_unittest.cc',
- 'base/keycodes/keycode_converter_unittest.cc',
'base/models/list_model_unittest.cc',
'base/models/list_selection_model_unittest.cc',
'base/models/tree_node_model_unittest.cc',
@@ -177,6 +176,7 @@
'base/x/x11_util_unittest.cc',
'events/event_dispatcher_unittest.cc',
'events/event_unittest.cc',
+ 'events/keycodes/dom4/keycode_converter_unittest.cc',
'events/latency_info_unittest.cc',
'events/ozone/evdev/key_event_converter_unittest.cc',
'events/ozone/evdev/touch_event_converter_unittest.cc',