From 7f05552488f8f9ea5000512fd1972894aee7ee82 Mon Sep 17 00:00:00 2001 From: "bryeung@chromium.org" Date: Fri, 3 Sep 2010 00:38:27 +0000 Subject: Re-lands 58186: Original message: """ Move the keyboard files from base/ to app/. Also moves the associated classes/enums from base:: to app::. TEST=try bots compile BUG=NONE Review URL: http://codereview.chromium.org/3165064 """ TBR=phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/3354005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58438 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/cocoa/html_dialog_window_controller.mm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'chrome/browser/cocoa') diff --git a/chrome/browser/cocoa/html_dialog_window_controller.mm b/chrome/browser/cocoa/html_dialog_window_controller.mm index 0db46c7..87691fb 100644 --- a/chrome/browser/cocoa/html_dialog_window_controller.mm +++ b/chrome/browser/cocoa/html_dialog_window_controller.mm @@ -4,7 +4,7 @@ #import "chrome/browser/cocoa/html_dialog_window_controller.h" -#include "base/keyboard_codes.h" +#include "app/keyboard_codes.h" #include "base/logging.h" #include "base/scoped_nsobject.h" #include "base/sys_string_conversions.h" @@ -194,8 +194,8 @@ void HtmlDialogWindowDelegateBridge::HandleKeyboardEvent( // TODO(thakis): It would be nice to get cancel: to work somehow. // Bug: http://code.google.com/p/chromium/issues/detail?id=32828 . if (event.type == NativeWebKeyboardEvent::RawKeyDown && - ((event.windowsKeyCode == base::VKEY_ESCAPE) || - (event.windowsKeyCode == base::VKEY_OEM_PERIOD && + ((event.windowsKeyCode == app::VKEY_ESCAPE) || + (event.windowsKeyCode == app::VKEY_OEM_PERIOD && event.modifiers == NativeWebKeyboardEvent::MetaKey))) { [controller_ close]; return; -- cgit v1.1