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

Unified Diff: chrome/browser/extensions/key_identifier_conversion_views.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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/key_identifier_conversion_views.cc
===================================================================
--- chrome/browser/extensions/key_identifier_conversion_views.cc (revision 150588)
+++ chrome/browser/extensions/key_identifier_conversion_views.cc (working copy)
@@ -12,6 +12,7 @@
#include "base/hash_tables.h"
#include "base/logging.h"
#include "content/public/browser/browser_thread.h"
+#include "ui/base/event.h"
#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/views/events/event.h"
@@ -288,18 +289,17 @@
static const int kNumKeyIdentifiers = arraysize(kKeyIdentifiers);
-typedef base::hash_map<std::string, const views::KeyEvent*> IdentifierMap;
-typedef std::pair<std::string, const views::KeyEvent*> IdentifierPair;
+typedef base::hash_map<std::string, const ui::KeyEvent*> IdentifierMap;
+typedef std::pair<std::string, const ui::KeyEvent*> IdentifierPair;
static IdentifierMap* identifierMaps[kNumIdentifierTypes] = { NULL };
-static views::KeyEvent* kUnknownKeyEvent = NULL;
+static ui::KeyEvent* kUnknownKeyEvent = NULL;
static void InitializeMaps() {
if (identifierMaps[0])
return;
- kUnknownKeyEvent = new views::KeyEvent(
- ui::ET_KEY_PRESSED, ui::VKEY_UNKNOWN, 0);
+ kUnknownKeyEvent = new ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_UNKNOWN, 0);
for (int i = 0; i < kNumIdentifierTypes; ++i)
identifierMaps[i] = new IdentifierMap;
@@ -307,8 +307,8 @@
for (int i = 0; i < kNumKeyIdentifiers; ++i) {
const KeyIdentifier& key = kKeyIdentifiers[i];
- views::KeyEvent* event = new views::KeyEvent(
- ui::ET_KEY_PRESSED, key.key_code, key.event_flags);
+ ui::KeyEvent* event =
+ new ui::KeyEvent(ui::ET_KEY_PRESSED, key.key_code, key.event_flags);
for (int j = 0; j < kNumIdentifierTypes; ++j) {
if (key.identifiers[j][0] != '\0') {
@@ -324,7 +324,7 @@
} // namespace
-const views::KeyEvent& KeyEventFromKeyIdentifier(
+const ui::KeyEvent& KeyEventFromKeyIdentifier(
const std::string& key_identifier) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
InitializeMaps();

Powered by Google App Engine
This is Rietveld 408576698