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

Side by Side Diff: chrome/browser/extensions/extension_input_api.cc

Issue 10825254: Remove views::KeyEvent, replacing uses of it with ui::KeyEvent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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
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 #include "chrome/browser/extensions/extension_input_api.h" 5 #include "chrome/browser/extensions/extension_input_api.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/extensions/key_identifier_conversion_views.h" 12 #include "chrome/browser/extensions/key_identifier_conversion_views.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/browser_window.h" 14 #include "chrome/browser/ui/browser_window.h"
15 #include "chrome/browser/ui/views/frame/browser_view.h" 15 #include "chrome/browser/ui/views/frame/browser_view.h"
16 #include "chrome/common/chrome_notification_types.h" 16 #include "chrome/common/chrome_notification_types.h"
17 #include "ui/base/event.h"
17 #include "ui/views/events/event.h" 18 #include "ui/views/events/event.h"
18 #include "ui/views/ime/input_method.h" 19 #include "ui/views/ime/input_method.h"
19 #include "ui/views/views_delegate.h" 20 #include "ui/views/views_delegate.h"
20 #include "ui/views/widget/widget.h" 21 #include "ui/views/widget/widget.h"
21 22
22 namespace { 23 namespace {
23 24
24 // Keys. 25 // Keys.
25 const char kType[] = "type"; 26 const char kType[] = "type";
26 const char kKeyIdentifier[] = "keyIdentifier"; 27 const char kKeyIdentifier[] = "keyIdentifier";
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 ui::EventType type = GetTypeFromString(type_name); 87 ui::EventType type = GetTypeFromString(type_name);
87 if (type == ui::ET_UNKNOWN) { 88 if (type == ui::ET_UNKNOWN) {
88 error_ = kUnknownEventTypeError; 89 error_ = kUnknownEventTypeError;
89 return false; 90 return false;
90 } 91 }
91 92
92 std::string identifier; 93 std::string identifier;
93 EXTENSION_FUNCTION_VALIDATE(args->GetString(kKeyIdentifier, &identifier)); 94 EXTENSION_FUNCTION_VALIDATE(args->GetString(kKeyIdentifier, &identifier));
94 TrimWhitespaceASCII(identifier, TRIM_ALL, &identifier); 95 TrimWhitespaceASCII(identifier, TRIM_ALL, &identifier);
95 96
96 const views::KeyEvent& prototype_event = 97 const ui::KeyEvent& prototype_event = KeyEventFromKeyIdentifier(identifier);
97 KeyEventFromKeyIdentifier(identifier);
98 uint16 character = 0; 98 uint16 character = 0;
99 if (prototype_event.key_code() == ui::VKEY_UNKNOWN) { 99 if (prototype_event.key_code() == ui::VKEY_UNKNOWN) {
100 // Check if |identifier| is "U+NNNN" format. 100 // Check if |identifier| is "U+NNNN" format.
101 character = UnicodeIdentifierStringToInt(identifier); 101 character = UnicodeIdentifierStringToInt(identifier);
102 if (!character) { 102 if (!character) {
103 error_ = kUnknownOrUnsupportedKeyIdentiferError; 103 error_ = kUnknownOrUnsupportedKeyIdentiferError;
104 return false; 104 return false;
105 } 105 }
106 } 106 }
107 107
108 bool flag = false; 108 bool flag = false;
109 int flags = 0; 109 int flags = 0;
110 if (prototype_event.key_code() != ui::VKEY_UNKNOWN) 110 if (prototype_event.key_code() != ui::VKEY_UNKNOWN)
111 flags = prototype_event.flags(); 111 flags = prototype_event.flags();
112 flags |= (args->GetBoolean(kAlt, &flag) && flag) ? ui::EF_ALT_DOWN : 0; 112 flags |= (args->GetBoolean(kAlt, &flag) && flag) ? ui::EF_ALT_DOWN : 0;
113 flags |= (args->GetBoolean(kCtrl, &flag) && flag) ? ui::EF_CONTROL_DOWN : 0; 113 flags |= (args->GetBoolean(kCtrl, &flag) && flag) ? ui::EF_CONTROL_DOWN : 0;
114 flags |= (args->GetBoolean(kShift, &flag) && flag) ? ui::EF_SHIFT_DOWN : 0; 114 flags |= (args->GetBoolean(kShift, &flag) && flag) ? ui::EF_SHIFT_DOWN : 0;
115 if (args->GetBoolean(kMeta, &flag) && flag) { 115 if (args->GetBoolean(kMeta, &flag) && flag) {
116 // Views does not have a Meta event flag, so return an error for now. 116 // Views does not have a Meta event flag, so return an error for now.
117 error_ = kUnsupportedModifier; 117 error_ = kUnsupportedModifier;
118 return false; 118 return false;
119 } 119 }
120 120
121 views::Widget* widget = GetTopLevelWidget(GetCurrentBrowser()); 121 views::Widget* widget = GetTopLevelWidget(GetCurrentBrowser());
122 if (!widget) { 122 if (!widget) {
123 error_ = kNoValidRecipientError; 123 error_ = kNoValidRecipientError;
124 return false; 124 return false;
125 } 125 }
126 126
127 views::KeyEvent event(type, prototype_event.key_code(), flags); 127 ui::KeyEvent event(type, prototype_event.key_code(), flags);
128 if (character) { 128 if (character) {
129 event.set_character(character); 129 event.set_character(character);
130 event.set_unmodified_character(character); 130 event.set_unmodified_character(character);
131 } 131 }
132 132
133 views::InputMethod* ime = widget->GetInputMethod(); 133 views::InputMethod* ime = widget->GetInputMethod();
134 if (ime) { 134 if (ime) {
135 ime->DispatchKeyEvent(event); 135 ime->DispatchKeyEvent(event);
136 } else if (!widget->OnKeyEvent(event)) { 136 } else if (!widget->OnKeyEvent(event)) {
137 error_ = kKeyEventUnprocessedError; 137 error_ = kKeyEventUnprocessedError;
138 return false; 138 return false;
139 } 139 }
140 140
141 return true; 141 return true;
142 } 142 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/wimax_config_view.cc ('k') | chrome/browser/extensions/key_identifier_conversion_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698