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

Unified Diff: chrome/browser/ui/cocoa/html_dialog_window_controller.mm

Issue 6246001: Move app/key* to ui/base/keycodes/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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
Index: chrome/browser/ui/cocoa/html_dialog_window_controller.mm
===================================================================
--- chrome/browser/ui/cocoa/html_dialog_window_controller.mm (revision 71220)
+++ chrome/browser/ui/cocoa/html_dialog_window_controller.mm (working copy)
@@ -4,7 +4,6 @@
#import "chrome/browser/ui/cocoa/html_dialog_window_controller.h"
-#include "app/keyboard_codes.h"
#include "base/logging.h"
#include "base/scoped_nsobject.h"
#include "base/sys_string_conversions.h"
@@ -17,6 +16,7 @@
#include "chrome/common/native_web_keyboard_event.h"
#include "gfx/size.h"
#include "ipc/ipc_message.h"
+#include "ui/base/keycodes/keyboard_codes.h"
// Thin bridge that routes notifications to
// HtmlDialogWindowController's member variables.
@@ -195,8 +195,8 @@
// 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 == app::VKEY_ESCAPE) ||
- (event.windowsKeyCode == app::VKEY_OEM_PERIOD &&
+ ((event.windowsKeyCode == ui::VKEY_ESCAPE) ||
+ (event.windowsKeyCode == ui::VKEY_OEM_PERIOD &&
event.modifiers == NativeWebKeyboardEvent::MetaKey))) {
[controller_ close];
return;
« no previous file with comments | « chrome/browser/renderer_host/render_widget_host_view_views.cc ('k') | chrome/browser/ui/find_bar/find_bar_host_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698