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

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

Issue 1649483002: Revert of Aura on Android: content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_select_file
Patch Set: Merging android_non_aura_browser_sources into android_browser_sources rather than private_browser_s… Created 4 years, 10 months 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
« no previous file with comments | « content/content_browser.gypi ('k') | content/public/browser/web_contents.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "content/common/content_export.h" 11 #include "content/common/content_export.h"
12 #include "third_party/WebKit/public/web/WebInputEvent.h" 12 #include "third_party/WebKit/public/web/WebInputEvent.h"
13 #include "ui/gfx/native_widget_types.h" 13 #include "ui/gfx/native_widget_types.h"
14 14
15 namespace ui { 15 namespace ui {
16 class KeyEvent; 16 class KeyEvent;
17 } 17 }
18 18
19 namespace content { 19 namespace content {
20 20
21 // Owns a platform specific event; used to pass own and pass event through 21 // Owns a platform specific event; used to pass own and pass event through
22 // platform independent code. 22 // platform independent code.
23 struct CONTENT_EXPORT NativeWebKeyboardEvent : 23 struct CONTENT_EXPORT NativeWebKeyboardEvent :
24 NON_EXPORTED_BASE(public blink::WebKeyboardEvent) { 24 NON_EXPORTED_BASE(public blink::WebKeyboardEvent) {
25 NativeWebKeyboardEvent(); 25 NativeWebKeyboardEvent();
26 26
27 explicit NativeWebKeyboardEvent(gfx::NativeEvent native_event); 27 explicit NativeWebKeyboardEvent(gfx::NativeEvent native_event);
28 #if defined(OS_ANDROID) && !defined(USE_AURA) 28 #if defined(OS_ANDROID)
29 NativeWebKeyboardEvent(blink::WebInputEvent::Type type, 29 NativeWebKeyboardEvent(blink::WebInputEvent::Type type,
30 int modifiers, 30 int modifiers,
31 double time_secs, 31 double time_secs,
32 int keycode, 32 int keycode,
33 int scancode, 33 int scancode,
34 int unicode_character, 34 int unicode_character,
35 bool is_system_key); 35 bool is_system_key);
36 // Takes ownership of android_key_event. 36 // Takes ownership of android_key_event.
37 NativeWebKeyboardEvent(jobject android_key_event, 37 NativeWebKeyboardEvent(jobject android_key_event,
38 blink::WebInputEvent::Type type, 38 blink::WebInputEvent::Type type,
(...skipping 29 matching lines...) Expand all
68 // True if the key event matches an edit command. In order to ensure the edit 68 // True if the key event matches an edit command. In order to ensure the edit
69 // command always work in web page, the browser should not pre-handle this key 69 // command always work in web page, the browser should not pre-handle this key
70 // event as a reserved accelerator. See http://crbug.com/54573 70 // event as a reserved accelerator. See http://crbug.com/54573
71 bool match_edit_command; 71 bool match_edit_command;
72 #endif 72 #endif
73 }; 73 };
74 74
75 } // namespace content 75 } // namespace content
76 76
77 #endif // CONTENT_PUBLIC_BROWSER_NATIVE_WEB_KEYBOARD_EVENT_H_ 77 #endif // CONTENT_PUBLIC_BROWSER_NATIVE_WEB_KEYBOARD_EVENT_H_
OLDNEW
« no previous file with comments | « content/content_browser.gypi ('k') | content/public/browser/web_contents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698