Re-lands 58186:

chrome/browser/cocoa/html_dialog_window_controller.mm

Index: chrome/browser/cocoa/html_dialog_window_controller.mm
diff --git a/chrome/browser/cocoa/html_dialog_window_controller.mm b/chrome/browser/cocoa/html_dialog_window_controller.mm
index 0db46c75c5d7ddcd6c2b9ff79f435892e5a13ec6..87691fb6778c87585339c95cdec6b06a9184faaf 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;