Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from bas...

chrome/browser/cocoa/html_dialog_window_controller.mm

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/cocoa/html_dialog_window_controller.h"
 
-#include "app/keyboard_codes.h"
+#include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/cocoa/browser_command_executor.h"
 #import "chrome/browser/cocoa/chrome_event_processing_window.h"
 #include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/dom_ui/html_dialog_tab_contents_delegate.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/native_web_keyboard_event.h"
@@ skipping 169 matching lines @@
   // since we handle keyboard events ourselves we can't do that.
   //
   // According to experiments, hitting Esc works regardless of the
   // presence of other modifiers (as long as it's not an app-level
   // shortcut, e.g. Commmand-Esc for Front Row) but no other modifiers
   // can be present for Command-. to work.
   //
   // 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 == base::VKEY_ESCAPE) ||
+       (event.windowsKeyCode == base::VKEY_OEM_PERIOD &&
         event.modifiers == NativeWebKeyboardEvent::MetaKey))) {
     [controller_ close];
     return;
   }
 
   ChromeEventProcessingWindow* event_window =
       static_cast<ChromeEventProcessingWindow*>([controller_ window]);
   DCHECK([event_window isKindOfClass:[ChromeEventProcessingWindow class]]);
   [event_window redispatchKeyEvent:event.os_event];
 }
@@ skipping 74 matching lines @@
   // TODO(akalin): Figure out why implementing (void)cancel:(id)sender
   // to do the above doesn't work.
 }
 
 - (void)windowWillClose:(NSNotification*)notification {
   delegate_->WindowControllerClosed();
   [self autorelease];
 }
 
 @end