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

chrome/browser/views/tab_contents/render_view_context_menu_views.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/tab_contents/render_view_context_menu_views.h"
 
-#include "app/keyboard_codes.h"
 #include "base/compiler_specific.h"
+#include "base/keyboard_codes.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/profile.h"
 #include "grit/generated_resources.h"
 #include "views/accelerator.h"
 #include "views/controls/menu/menu_2.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // RenderViewContextMenuViews, public:
 
 RenderViewContextMenuViews::RenderViewContextMenuViews(
@@ skipping 42 matching lines @@
 #endif
 }
 
 bool RenderViewContextMenuViews::GetAcceleratorForCommandId(
     int command_id,
     menus::Accelerator* accel) {
   // There are no formally defined accelerators we can query so we assume
   // that Ctrl+C, Ctrl+V, Ctrl+X, Ctrl-A, etc do what they normally do.
   switch (command_id) {
     case IDC_CONTENT_CONTEXT_UNDO:
-      *accel = views::Accelerator(app::VKEY_Z, false, true, false);
+      *accel = views::Accelerator(base::VKEY_Z, false, true, false);
       return true;
 
     case IDC_CONTENT_CONTEXT_REDO:
       // TODO(jcampan): should it be Ctrl-Y?
-      *accel = views::Accelerator(app::VKEY_Z, true, true, false);
+      *accel = views::Accelerator(base::VKEY_Z, true, true, false);
       return true;
 
     case IDC_CONTENT_CONTEXT_CUT:
-      *accel = views::Accelerator(app::VKEY_X, false, true, false);
+      *accel = views::Accelerator(base::VKEY_X, false, true, false);
       return true;
 
     case IDC_CONTENT_CONTEXT_COPY:
-      *accel = views::Accelerator(app::VKEY_C, false, true, false);
+      *accel = views::Accelerator(base::VKEY_C, false, true, false);
       return true;
 
     case IDC_CONTENT_CONTEXT_PASTE:
-      *accel = views::Accelerator(app::VKEY_V, false, true, false);
+      *accel = views::Accelerator(base::VKEY_V, false, true, false);
       return true;
 
     case IDC_CONTENT_CONTEXT_SELECTALL:
-      *accel = views::Accelerator(app::VKEY_A, false, true, false);
+      *accel = views::Accelerator(base::VKEY_A, false, true, false);
       return true;
 
     default:
       return false;
   }
 }