| Index: chrome/browser/extensions/extension_host.cc
|
| diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc
|
| index 1c1a6754d82e8a13626d87d8714de4cddb30a320..b9da2e8c9211ba812b9bbf8042bab7f573ed5d90 100644
|
| --- a/chrome/browser/extensions/extension_host.cc
|
| +++ b/chrome/browser/extensions/extension_host.cc
|
| @@ -6,9 +6,9 @@
|
|
|
| #include <list>
|
|
|
| +#include "app/keyboard_codes.h"
|
| #include "app/l10n_util.h"
|
| #include "app/resource_bundle.h"
|
| -#include "base/keyboard_codes.h"
|
| #include "base/message_loop.h"
|
| #include "base/singleton.h"
|
| #include "base/string_util.h"
|
| @@ -619,7 +619,7 @@ bool ExtensionHost::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
|
| bool* is_keyboard_shortcut) {
|
| if (extension_host_type_ == ViewType::EXTENSION_POPUP &&
|
| event.type == NativeWebKeyboardEvent::RawKeyDown &&
|
| - event.windowsKeyCode == base::VKEY_ESCAPE) {
|
| + event.windowsKeyCode == app::VKEY_ESCAPE) {
|
| DCHECK(is_keyboard_shortcut != NULL);
|
| *is_keyboard_shortcut = true;
|
| }
|
| @@ -629,7 +629,7 @@ bool ExtensionHost::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
|
| void ExtensionHost::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
|
| if (extension_host_type_ == ViewType::EXTENSION_POPUP) {
|
| if (event.type == NativeWebKeyboardEvent::RawKeyDown &&
|
| - event.windowsKeyCode == base::VKEY_ESCAPE) {
|
| + event.windowsKeyCode == app::VKEY_ESCAPE) {
|
| NotificationService::current()->Notify(
|
| NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE,
|
| Source<Profile>(profile_),
|
|
|