Fix key identifier conversion.

chrome/browser/extensions/extension_input_api.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_input_api.h"
 
 #include <string>
 
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
+#include "chrome/browser/extensions/key_identifier_conversion_views.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/common/native_web_keyboard_event.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
-#include "ui/base/keycodes/keyboard_code_conversion.h"
 #include "views/event.h"
 #include "views/widget/root_view.h"
 
 namespace {
 
 // Keys.
 const char kType[] = "type";
 const char kKeyIdentifier[] = "keyIdentifier";
 const char kAlt[] = "altKey";
 const char kCtrl[] = "ctrlKey";
 const char kMeta[] = "metaKey";
 const char kShift[] = "shiftKey";
 const char kKeyDown[] = "keydown";
 const char kKeyUp[] = "keyup";
 
 // Errors.
 const char kUnknownEventTypeError[] = "Unknown event type.";
 const char kUnknownOrUnsupportedKeyIdentiferError[] = "Unknown or unsupported "
     "key identifier.";
+const char kUnsupportedModifier[] = "Unsupported modifier.";
 const char kNoValidRecipientError[] = "No valid recipient for event.";
 const char kKeyEventUnprocessedError[] = "Event was not handled.";
 
 views::Event::EventType GetTypeFromString(const std::string& type) {
   if (type == kKeyDown) {
     return views::Event::ET_KEY_PRESSED;
   } else if (type == kKeyUp) {
     return views::Event::ET_KEY_RELEASED;
   }
   return views::Event::ET_UNKNOWN;
@@ skipping 31 matching lines @@
   views::Event::EventType type = GetTypeFromString(type_name);
   if (type == views::Event::ET_UNKNOWN) {
     error_ = kUnknownEventTypeError;
     return false;
   }
 
   std::string identifier;
   EXTENSION_FUNCTION_VALIDATE(args->GetString(kKeyIdentifier, &identifier));
   TrimWhitespaceASCII(identifier, TRIM_ALL, &identifier);
 
-  ui::KeyboardCode code = ui::KeyCodeFromKeyIdentifier(identifier);
-  if (code == ui::VKEY_UNKNOWN) {
+  const views::KeyEvent& prototype_event =
+      KeyEventFromKeyIdentifier(identifier);
+  if (prototype_event.GetKeyCode() == ui::VKEY_UNKNOWN) {
     error_ = kUnknownOrUnsupportedKeyIdentiferError;
     return false;
   }
 
-  int flags = 0;
+  int flags = prototype_event.GetFlags();
   bool alt = false;
   if (args->GetBoolean(kAlt, &alt))
-    flags |= alt ? WebKit::WebInputEvent::AltKey : 0;
+    flags |= alt ? views::Event::EF_ALT_DOWN : 0;
   bool ctrl = false;
   if (args->GetBoolean(kCtrl, &ctrl))
-    flags |= ctrl ? WebKit::WebInputEvent::ControlKey : 0;
-  bool meta = false;
-  if (args->GetBoolean(kMeta, &meta))
-    flags |= meta ? WebKit::WebInputEvent::MetaKey : 0;
+    flags |= ctrl ? views::Event::EF_CONTROL_DOWN : 0;
   bool shift = false;
   if (args->GetBoolean(kShift, &shift))
-    flags |= shift ? WebKit::WebInputEvent::ShiftKey : 0;
+    flags |= shift ? views::Event::EF_SHIFT_DOWN : 0;
+  bool meta = false;
+  if (args->GetBoolean(kMeta, &meta)) {
+    // Views does not have a Meta event flag, so return an error for now.
+    if (meta) {
+      error_ = kUnsupportedModifier;
+      return false;
+    }
+  }
 
   views::RootView* root_view = GetRootView();
   if (!root_view) {
     error_ = kNoValidRecipientError;
     return false;
   }
 
-  views::KeyEvent event(type, code, flags, 0, 0);
+  views::KeyEvent event(type, prototype_event.GetKeyCode(), flags, 0, 0);
   if (!root_view->ProcessKeyEvent(event)) {
     error_ = kKeyEventUnprocessedError;
     return false;
   }
 
   return true;
 }