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

chrome/browser/gtk/browser_window_gtk.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/gtk/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include <string>
 
 #include "app/gtk_util.h"
-#include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "base/base_paths.h"
 #include "base/command_line.h"
+#include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/singleton.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/app_modal_dialog_queue.h"
@@ skipping 266 matching lines @@
 bool ShouldExecuteReservedCommandImmediately(
     const NativeWebKeyboardEvent& event, int command_id) {
   // IDC_EXIT is now only bound to Ctrl+Shift+q, so we should always execute it
   // immediately.
   if (command_id == IDC_EXIT)
     return true;
 
   // Keys like Ctrl+w, Ctrl+n, etc. should always be sent to the renderer first,
   // otherwise some web apps or the Emacs key bindings may not work correctly.
   int vkey = event.windowsKeyCode;
-  if ((vkey >= app::VKEY_0 && vkey <= app::VKEY_9) ||
-      (vkey >= app::VKEY_A && vkey <= app::VKEY_Z))
+  if ((vkey >= base::VKEY_0 && vkey <= base::VKEY_9) ||
+      (vkey >= base::VKEY_A && vkey <= base::VKEY_Z))
     return false;
 
   // All other reserved accelerators should be processed immediately.
   return true;
 }
 
 // Performs Cut/Copy/Paste operation on the |window|.
 // If the current render view is focused, then just call the specified |method|
 // against the current render view host, otherwise emit the specified |signal|
 // against the focused widget.
@@ skipping 1855 matching lines @@
   // special-case the ones where the custom frame should be used.  These names
   // are taken from the WMs' source code.
   return (wm_name == "Blackbox" ||
           wm_name == "compiz" ||
           wm_name == "e16" ||  // Enlightenment DR16
           wm_name == "Metacity" ||
           wm_name == "Mutter" ||
           wm_name == "Openbox" ||
           wm_name == "Xfwm4");
 }