Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(357)

Side by Side Diff: content/public/browser/native_web_keyboard_event.h

Issue 1411503005: Aura on Android: content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_select_file
Patch Set: Addressing some feedback. Fixes for content/child and content/public/browser targets. Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_PUBLIC_BROWSER_NATIVE_WEB_KEYBOARD_EVENT_H_ 5 #ifndef CONTENT_PUBLIC_BROWSER_NATIVE_WEB_KEYBOARD_EVENT_H_
6 #define CONTENT_PUBLIC_BROWSER_NATIVE_WEB_KEYBOARD_EVENT_H_ 6 #define CONTENT_PUBLIC_BROWSER_NATIVE_WEB_KEYBOARD_EVENT_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "content/common/content_export.h" 12 #include "content/common/content_export.h"
13 #include "third_party/WebKit/public/web/WebInputEvent.h" 13 #include "third_party/WebKit/public/web/WebInputEvent.h"
14 #include "ui/gfx/native_widget_types.h" 14 #include "ui/gfx/native_widget_types.h"
15 15
16 namespace ui { 16 namespace ui {
17 class KeyEvent; 17 class KeyEvent;
18 } 18 }
19 19
20 namespace content { 20 namespace content {
21 21
22 // Owns a platform specific event; used to pass own and pass event through 22 // Owns a platform specific event; used to pass own and pass event through
23 // platform independent code. 23 // platform independent code.
24 struct CONTENT_EXPORT NativeWebKeyboardEvent : 24 struct CONTENT_EXPORT NativeWebKeyboardEvent :
25 NON_EXPORTED_BASE(public blink::WebKeyboardEvent) { 25 NON_EXPORTED_BASE(public blink::WebKeyboardEvent) {
26 NativeWebKeyboardEvent(); 26 NativeWebKeyboardEvent();
27 27
28 explicit NativeWebKeyboardEvent(gfx::NativeEvent native_event); 28 explicit NativeWebKeyboardEvent(gfx::NativeEvent native_event);
29 #if defined(OS_ANDROID) 29 #if defined(OS_ANDROID) && !defined(USE_AURA)
30 NativeWebKeyboardEvent(blink::WebInputEvent::Type type, 30 NativeWebKeyboardEvent(blink::WebInputEvent::Type type,
31 int modifiers, 31 int modifiers,
32 double time_secs, 32 double time_secs,
33 int keycode, 33 int keycode,
34 int scancode, 34 int scancode,
35 int unicode_character, 35 int unicode_character,
36 bool is_system_key); 36 bool is_system_key);
37 // Takes ownership of android_key_event. 37 // Takes ownership of android_key_event.
38 NativeWebKeyboardEvent(jobject android_key_event, 38 NativeWebKeyboardEvent(jobject android_key_event,
39 blink::WebInputEvent::Type type, 39 blink::WebInputEvent::Type type,
(...skipping 29 matching lines...) Expand all
69 // True if the key event matches an edit command. In order to ensure the edit 69 // True if the key event matches an edit command. In order to ensure the edit
70 // command always work in web page, the browser should not pre-handle this key 70 // command always work in web page, the browser should not pre-handle this key
71 // event as a reserved accelerator. See http://crbug.com/54573 71 // event as a reserved accelerator. See http://crbug.com/54573
72 bool match_edit_command; 72 bool match_edit_command;
73 #endif 73 #endif
74 }; 74 };
75 75
76 } // namespace content 76 } // namespace content
77 77
78 #endif // CONTENT_PUBLIC_BROWSER_NATIVE_WEB_KEYBOARD_EVENT_H_ 78 #endif // CONTENT_PUBLIC_BROWSER_NATIVE_WEB_KEYBOARD_EVENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698