Commit ba9e0997 authored by Wez's avatar Wez Committed by Commit Bot

Revert "Add plumbing for keymap"

This reverts commit 6ec27fc3.

Reason for revert: Remove unused keymapping arguments.

Original change's description:
> Add plumbing for keymap
>
>
> Change-Id: I5b68fd4345e9331c7de5f6947a4cc17cf5d5992a
> Bug: 920824
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1495594
> Reviewed-by: Gary Kacmarcik <garykac@chromium.org>
> Reviewed-by: Greg Kerr <kerrnel@chromium.org>
> Commit-Queue: Jianpeng Chao <chaopeng@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#640047}

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 920824, 1045960
Change-Id: I302d95c9d0dcd6fab7d4f123ecdb4ca7d49ae3e9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2022710Reviewed-by: default avatarWill Harris <wfh@chromium.org>
Reviewed-by: default avatarDavid Bokan <bokan@chromium.org>
Reviewed-by: default avatarSadrul Chowdhury <sadrul@chromium.org>
Commit-Queue: Will Harris <wfh@chromium.org>
Auto-Submit: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736407}
parent ba94e6f8
...@@ -23,19 +23,6 @@ if (is_ios) { ...@@ -23,19 +23,6 @@ if (is_ios) {
# TODO(crbug.com/1018739): remove this when migration is done. # TODO(crbug.com/1018739): remove this when migration is done.
set_sources_assignment_filter([]) set_sources_assignment_filter([])
if (is_android) {
if (!defined(keycode_conversion_data_android_path)) {
keycode_conversion_data_android_path =
"keycodes/dom/keycode_conversion_data_android.inc"
}
keycode_conversion_data_android_gen_path = "$target_gen_dir/keycodes/dom/keycode_conversion_data_android_generated.inc"
copy("keycode_conversion_data_android") {
sources = [ keycode_conversion_data_android_path ]
outputs = [ keycode_conversion_data_android_gen_path ]
}
}
jumbo_static_library("dom_keycode_converter") { jumbo_static_library("dom_keycode_converter") {
public = [ public = [
"keycodes/dom/dom_code.h", "keycodes/dom/dom_code.h",
...@@ -55,12 +42,6 @@ jumbo_static_library("dom_keycode_converter") { ...@@ -55,12 +42,6 @@ jumbo_static_library("dom_keycode_converter") {
if (!is_ios) { if (!is_ios) {
deps += [ "//ipc:param_traits" ] deps += [ "//ipc:param_traits" ]
} }
if (is_android) {
sources += [ keycode_conversion_data_android_gen_path ]
deps += [ ":keycode_conversion_data_android" ]
}
} }
static_library("dom_keyboard_layout") { static_library("dom_keyboard_layout") {
...@@ -196,12 +177,6 @@ jumbo_component("events_base") { ...@@ -196,12 +177,6 @@ jumbo_component("events_base") {
"Carbon.framework", "Carbon.framework",
] ]
} }
if (is_android) {
sources += [ keycode_conversion_data_android_gen_path ]
deps += [ ":keycode_conversion_data_android" ]
}
} }
jumbo_component("events") { jumbo_component("events") {
......
...@@ -85,12 +85,6 @@ DOM_CODE_DECLARATION { ...@@ -85,12 +85,6 @@ DOM_CODE_DECLARATION {
// USB evdev XKB Win Mac Code // USB evdev XKB Win Mac Code
DOM_CODE(0x000000, 0x0000, 0x0000, 0x0000, 0xffff, NULL, NONE), // Invalid DOM_CODE(0x000000, 0x0000, 0x0000, 0x0000, 0xffff, NULL, NONE), // Invalid
#if defined(OS_ANDROID)
#define DOM_CODE_ANDROID
#include "ui/events/keycodes/dom/keycode_conversion_data_android_generated.inc"
#undef DOM_CODE_ANDROID
#endif
// ========================================= // =========================================
// Non-USB codes // Non-USB codes
// ========================================= // =========================================
......
...@@ -25,12 +25,6 @@ ...@@ -25,12 +25,6 @@
DOM_KEY_MAP_DECLARATION { DOM_KEY_MAP_DECLARATION {
#if defined(OS_ANDROID)
#define DOM_KEY_MAP_ANDROID
#include "ui/events/keycodes/dom/keycode_conversion_data_android_generated.inc"
#undef DOM_KEY_MAP_ANDROID
#endif
// To avoid ambiguities, a small number of .key values that do have // To avoid ambiguities, a small number of .key values that do have
// standard names are encoded identical to corresponding Unicode characters; // standard names are encoded identical to corresponding Unicode characters;
// for example, DomKey('\t') == DomKey::TAB. // for example, DomKey('\t') == DomKey::TAB.
......
// Copyright 2019 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.
...@@ -6,8 +6,6 @@ ...@@ -6,8 +6,6 @@
#include <android/keycodes.h> #include <android/keycodes.h>
#include "build/build_config.h"
namespace ui { namespace ui {
namespace { namespace {
...@@ -75,11 +73,6 @@ DomKey GetDomKeyFromAndroidKeycode(int keycode) { ...@@ -75,11 +73,6 @@ DomKey GetDomKeyFromAndroidKeycode(int keycode) {
default: default:
case AKEYCODE_UNKNOWN: case AKEYCODE_UNKNOWN:
return DomKey::NONE; return DomKey::NONE;
#if defined(OS_ANDROID)
#define ANDROID_KEYCODE_TO_DOM_KEY
#include "ui/events/keycodes/dom/keycode_conversion_data_android_generated.inc"
#undef ANDROID_KEYCODE_TO_DOM_KEY
#endif
case AKEYCODE_HOME: case AKEYCODE_HOME:
return DomKey::GO_HOME; return DomKey::GO_HOME;
case AKEYCODE_BACK: case AKEYCODE_BACK:
...@@ -542,11 +535,6 @@ DomKey GetDomKeyFromAndroidEvent(int keycode, int unicode_character) { ...@@ -542,11 +535,6 @@ DomKey GetDomKeyFromAndroidEvent(int keycode, int unicode_character) {
KeyboardCode KeyboardCodeFromAndroidKeyCode(int keycode) { KeyboardCode KeyboardCodeFromAndroidKeyCode(int keycode) {
// Does not provide all key codes, and does not handle all keys. // Does not provide all key codes, and does not handle all keys.
switch (keycode) { switch (keycode) {
#if defined(OS_ANDROID)
#define ANDROID_KEYCODE_TO_KB_CODE
#include "ui/events/keycodes/dom/keycode_conversion_data_android_generated.inc"
#undef ANDROID_KEYCODE_TO_KB_CODE
#endif
case AKEYCODE_DEL: case AKEYCODE_DEL:
return VKEY_BACK; return VKEY_BACK;
case AKEYCODE_TAB: case AKEYCODE_TAB:
......
...@@ -225,7 +225,6 @@ enum KeyboardCode { ...@@ -225,7 +225,6 @@ enum KeyboardCode {
VKEY_BRIGHTNESS_UP = 0xD9, VKEY_BRIGHTNESS_UP = 0xD9,
VKEY_KBD_BRIGHTNESS_DOWN = 0xDA, VKEY_KBD_BRIGHTNESS_DOWN = 0xDA,
VKEY_KBD_BRIGHTNESS_UP = 0xE8, VKEY_KBD_BRIGHTNESS_UP = 0xE8,
VKEY_SPATNAV_BACK = 0xE9,
// Windows does not have a specific key code for AltGr. We use the unused 0xE1 // Windows does not have a specific key code for AltGr. We use the unused 0xE1
// (VK_OEM_AX) code to represent AltGr, matching the behaviour of Firefox on // (VK_OEM_AX) code to represent AltGr, matching the behaviour of Firefox on
......
...@@ -191,7 +191,6 @@ enum KeyboardCode { ...@@ -191,7 +191,6 @@ enum KeyboardCode {
BRIGHTNESS_UP = 0xD9, BRIGHTNESS_UP = 0xD9,
KBD_BRIGHTNESS_DOWN = 0xDA, KBD_BRIGHTNESS_DOWN = 0xDA,
KBD_BRIGHTNESS_UP = 0xE8, KBD_BRIGHTNESS_UP = 0xE8,
SPATNAV_BACK = 0xE9,
// Windows does not have a specific key code for AltGr. We use the unused // Windows does not have a specific key code for AltGr. We use the unused
// VK_OEM_AX to represent AltGr, matching the behaviour of Firefox on Linux. // VK_OEM_AX to represent AltGr, matching the behaviour of Firefox on Linux.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment