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

Side by Side Diff: chrome/common/native_web_keyboard_event_views.cc

Issue 7840010: Revert 99810 - Get the rest of the chrome target to build (but not link) with USE_AURA. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/default_plugin/default_plugin.gyp » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "chrome/common/native_web_keyboard_event_views.h" 5 #include "chrome/common/native_web_keyboard_event_views.h"
6 6
7 #if defined(TOOLKIT_USES_GTK) 7 #if defined(TOOLKIT_USES_GTK)
8 #include <gdk/gdk.h> 8 #include <gdk/gdk.h>
9 #endif 9 #endif
10 10
(...skipping 24 matching lines...) Expand all
35 type = WebKit::WebInputEvent::KeyUp; 35 type = WebKit::WebInputEvent::KeyUp;
36 36
37 modifiers = ViewsFlagsToWebInputEventModifiers(event.flags()); 37 modifiers = ViewsFlagsToWebInputEventModifiers(event.flags());
38 timeStampSeconds = event.time_stamp().ToDoubleT(); 38 timeStampSeconds = event.time_stamp().ToDoubleT();
39 windowsKeyCode = event.key_code(); 39 windowsKeyCode = event.key_code();
40 nativeKeyCode = windowsKeyCode; 40 nativeKeyCode = windowsKeyCode;
41 text[0] = event.GetCharacter(); 41 text[0] = event.GetCharacter();
42 unmodifiedText[0] = event.GetUnmodifiedCharacter(); 42 unmodifiedText[0] = event.GetUnmodifiedCharacter();
43 setKeyIdentifierFromWindowsKeyCode(); 43 setKeyIdentifierFromWindowsKeyCode();
44 44
45 #if defined(USE_AURA) 45 #if defined(OS_WIN)
46 // TODO(beng):
47 NOTIMPLEMENTED();
48 #elif defined(OS_WIN)
49 // |os_event| is a MSG struct, so we can copy it directly. 46 // |os_event| is a MSG struct, so we can copy it directly.
50 os_event = event.native_event(); 47 os_event = event.native_event();
51 #elif defined(TOOLKIT_USES_GTK) 48 #elif defined(TOOLKIT_USES_GTK)
52 if (event.native_event()) { 49 if (event.native_event()) {
53 os_event = 50 os_event =
54 reinterpret_cast<GdkEventKey*>(gdk_event_copy(event.native_event())); 51 reinterpret_cast<GdkEventKey*>(gdk_event_copy(event.native_event()));
55 nativeKeyCode = os_event->keyval; 52 nativeKeyCode = os_event->keyval;
56 } else { 53 } else {
57 os_event = NULL; 54 os_event = NULL;
58 } 55 }
(...skipping 26 matching lines...) Expand all
85 os_event = NULL; 82 os_event = NULL;
86 #endif 83 #endif
87 84
88 #if defined(TOOLKIT_USES_GTK) 85 #if defined(TOOLKIT_USES_GTK)
89 match_edit_command = false; 86 match_edit_command = false;
90 #endif 87 #endif
91 } 88 }
92 89
93 NativeWebKeyboardEventViews::~NativeWebKeyboardEventViews() { 90 NativeWebKeyboardEventViews::~NativeWebKeyboardEventViews() {
94 } 91 }
OLDNEW
« no previous file with comments | « no previous file | chrome/default_plugin/default_plugin.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698