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

Side by Side Diff: content/browser/renderer_host/native_web_keyboard_event_aura.cc

Issue 2120153003: Remove keyIdentifier. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_key_identifier_3a
Patch Set: Rebase Created 4 years, 5 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
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 "content/public/browser/native_web_keyboard_event.h" 5 #include "content/public/browser/native_web_keyboard_event.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/browser/renderer_host/web_input_event_aura.h" 8 #include "content/browser/renderer_host/web_input_event_aura.h"
9 #include "ui/events/base_event_utils.h" 9 #include "ui/events/base_event_utils.h"
10 #include "ui/events/event.h" 10 #include "ui/events/event.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 49
50 NativeWebKeyboardEvent::NativeWebKeyboardEvent(const ui::KeyEvent& key_event, 50 NativeWebKeyboardEvent::NativeWebKeyboardEvent(const ui::KeyEvent& key_event,
51 base::char16 character) 51 base::char16 character)
52 : WebKeyboardEvent(MakeWebKeyboardEvent(key_event)), 52 : WebKeyboardEvent(MakeWebKeyboardEvent(key_event)),
53 os_event(NULL), 53 os_event(NULL),
54 skip_in_browser(false) { 54 skip_in_browser(false) {
55 type = blink::WebInputEvent::Char; 55 type = blink::WebInputEvent::Char;
56 windowsKeyCode = character; 56 windowsKeyCode = character;
57 text[0] = character; 57 text[0] = character;
58 unmodifiedText[0] = character; 58 unmodifiedText[0] = character;
59 setKeyIdentifierFromWindowsKeyCode();
60 } 59 }
61 60
62 NativeWebKeyboardEvent& NativeWebKeyboardEvent::operator=( 61 NativeWebKeyboardEvent& NativeWebKeyboardEvent::operator=(
63 const NativeWebKeyboardEvent& other) { 62 const NativeWebKeyboardEvent& other) {
64 WebKeyboardEvent::operator=(other); 63 WebKeyboardEvent::operator=(other);
65 delete os_event; 64 delete os_event;
66 os_event = CopyEvent(other.os_event); 65 os_event = CopyEvent(other.os_event);
67 skip_in_browser = other.skip_in_browser; 66 skip_in_browser = other.skip_in_browser;
68 return *this; 67 return *this;
69 } 68 }
70 69
71 NativeWebKeyboardEvent::~NativeWebKeyboardEvent() { 70 NativeWebKeyboardEvent::~NativeWebKeyboardEvent() {
72 delete os_event; 71 delete os_event;
73 } 72 }
74 73
75 } // namespace content 74 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698