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

Unified Diff: chrome/browser/extensions/extension_input_api.cc

Issue 3337006: Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from bas... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 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
« no previous file with comments | « chrome/browser/extensions/extension_host.cc ('k') | chrome/browser/external_tab_container_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_input_api.cc
===================================================================
--- chrome/browser/extensions/extension_input_api.cc (revision 58389)
+++ chrome/browser/extensions/extension_input_api.cc (working copy)
@@ -6,8 +6,8 @@
#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"
@@ -84,8 +84,8 @@
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;
}
« no previous file with comments | « chrome/browser/extensions/extension_host.cc ('k') | chrome/browser/external_tab_container_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698