Aura on Android: UnhandledKeyboardEventHandler::HandleNativeKeyboardE…

…vent implementaion. Using Linux implementation of UnhandledKeyboardEventHandler::HandleNativeKeyboardEvent on Android Aura. BUG=507792 Review URL: https://codereview.chromium.org/1403283002 Cr-Commit-Position: refs/heads/master@{#355448}
Denger-Network · Oct 22, 2015 · 437e3af · 437e3af
1 parent 22bc1e2
commit 437e3af
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/ui/views/controls/webview/BUILD.gn b/ui/views/controls/webview/BUILD.gn
@@ -6,7 +6,6 @@ component("webview") {
   sources = [
     "unhandled_keyboard_event_handler.cc",
     "unhandled_keyboard_event_handler.h",
-    "unhandled_keyboard_event_handler_linux.cc",
     "unhandled_keyboard_event_handler_win.cc",
     "web_dialog_view.cc",
     "web_dialog_view.h",
@@ -39,6 +38,10 @@ component("webview") {
     "//ui/gfx/geometry",
     "//ui/views",
   ]
+
+  if (is_linux || is_android) {
+    sources += [ "unhandled_keyboard_event_handler_default.cc" ]
+  }
 }
 
 source_set("test_support") {

diff --git a/...unhandled_keyboard_event_handler_linux.cc → ...handled_keyboard_event_handler_default.cc b/...unhandled_keyboard_event_handler_linux.cc → ...handled_keyboard_event_handler_default.cc
diff --git a/ui/views/controls/webview/webview.gyp b/ui/views/controls/webview/webview.gyp
@@ -33,7 +33,6 @@
         # Note: file list duplicated in GN build.
         'unhandled_keyboard_event_handler.cc',
         'unhandled_keyboard_event_handler.h',
-        'unhandled_keyboard_event_handler_linux.cc',
         'unhandled_keyboard_event_handler_mac.mm',
         'unhandled_keyboard_event_handler_win.cc',
         'web_dialog_view.cc',
@@ -42,6 +41,11 @@
         'webview.h',
         'webview_export.h',
       ],
+      'conditions': [
+        ['OS=="linux" or OS=="android"', {
+          'sources': [ 'unhandled_keyboard_event_handler_default.cc', ],
+        }],
+      ],
     },
   ],
 }