Re-lands 58186:

chrome/browser/views/unhandled_keyboard_event_handler.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/views/unhandled_keyboard_event_handler.h"
 
 #include "base/logging.h"
 #include "views/focus/focus_manager.h"
 
 UnhandledKeyboardEventHandler::UnhandledKeyboardEventHandler() {
@@ skipping 20 matching lines @@
     ignore_next_char_event_ = false;
     return;
   }
   // It's necessary to reset this flag, because a RawKeyDown event may not
   // always generate a Char event.
   ignore_next_char_event_ = false;
 #endif
 
   if (event.type == WebKit::WebInputEvent::RawKeyDown) {
     views::Accelerator accelerator(
-        static_cast<base::KeyboardCode>(event.windowsKeyCode),
+        static_cast<app::KeyboardCode>(event.windowsKeyCode),
         (event.modifiers & NativeWebKeyboardEvent::ShiftKey) ==
             NativeWebKeyboardEvent::ShiftKey,
         (event.modifiers & NativeWebKeyboardEvent::ControlKey) ==
             NativeWebKeyboardEvent::ControlKey,
         (event.modifiers & NativeWebKeyboardEvent::AltKey) ==
             NativeWebKeyboardEvent::AltKey);
 
 #if defined(OS_WIN)
     // This is tricky: we want to set ignore_next_char_event_ if
     // ProcessAccelerator returns true. But ProcessAccelerator might delete
@@ skipping 14 matching lines @@
   }
 
 #if defined(OS_WIN)
   // Any unhandled keyboard/character messages should be defproced.
   // This allows stuff like F10, etc to work correctly.
   DefWindowProc(event.os_event.hwnd, event.os_event.message,
                 event.os_event.wParam, event.os_event.lParam);
 #endif
 }