Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from bas...

chrome/browser/extensions/extension_input_api.cc

 // Copyright (c) 2010 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 "app/keyboard_code_conversion.h"
 #include "base/values.h"
+#include "base/keyboard_code_conversion.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/common/native_web_keyboard_event.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
 #include "views/event.h"
 #include "views/widget/root_view.h"
@@ skipping 56 matching lines @@
   std::string type_name;
   EXTENSION_FUNCTION_VALIDATE(args->GetString(kType, &type_name));
   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));
-  app::KeyboardCode code = app::KeyCodeFromKeyIdentifier(identifier);
-  if (code == app::VKEY_UNKNOWN) {
+  base::KeyboardCode code = base::KeyCodeFromKeyIdentifier(identifier);
+  if (code == base::VKEY_UNKNOWN) {
     error_ = kUnknownOrUnsupportedKeyIdentiferError;
     return false;
   }
 
   int flags = 0;
   bool alt = false;
   if (args->GetBoolean(kAlt, &alt))
     flags |= alt ? WebKit::WebInputEvent::AltKey : 0;
   bool ctrl = false;
   if (args->GetBoolean(kCtrl, &ctrl))
@@ skipping 12 matching lines @@
   }
 
   views::KeyEvent event(type, code, flags, 0, 0);
   if (!root_view->ProcessKeyEvent(event)) {
     error_ = kKeyEventUnprocessedError;
     return false;
   }
 
   return true;
 }