Re-lands 58186:

chrome/browser/views/tab_contents/render_view_context_menu_views.cc

Index: chrome/browser/views/tab_contents/render_view_context_menu_views.cc
diff --git a/chrome/browser/views/tab_contents/render_view_context_menu_views.cc b/chrome/browser/views/tab_contents/render_view_context_menu_views.cc
index f2092c591f08412618c864d4659f501f3709a8a6..8efb30b008192cb65922683fb490a2ccc297ff9a 100644
--- a/chrome/browser/views/tab_contents/render_view_context_menu_views.cc
+++ b/chrome/browser/views/tab_contents/render_view_context_menu_views.cc
@@ -4,8 +4,8 @@
 
 #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"
@@ -68,28 +68,28 @@ bool RenderViewContextMenuViews::GetAcceleratorForCommandId(
   // 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(base::VKEY_Z, false, true, false);
+      *accel = views::Accelerator(app::VKEY_Z, false, true, false);
       return true;
 
     case IDC_CONTENT_CONTEXT_REDO:
       // TODO(jcampan): should it be Ctrl-Y?
-      *accel = views::Accelerator(base::VKEY_Z, true, true, false);
+      *accel = views::Accelerator(app::VKEY_Z, true, true, false);
       return true;
 
     case IDC_CONTENT_CONTEXT_CUT:
-      *accel = views::Accelerator(base::VKEY_X, false, true, false);
+      *accel = views::Accelerator(app::VKEY_X, false, true, false);
       return true;
 
     case IDC_CONTENT_CONTEXT_COPY:
-      *accel = views::Accelerator(base::VKEY_C, false, true, false);
+      *accel = views::Accelerator(app::VKEY_C, false, true, false);
       return true;
 
     case IDC_CONTENT_CONTEXT_PASTE:
-      *accel = views::Accelerator(base::VKEY_V, false, true, false);
+      *accel = views::Accelerator(app::VKEY_V, false, true, false);
       return true;
 
     case IDC_CONTENT_CONTEXT_SELECTALL:
-      *accel = views::Accelerator(base::VKEY_A, false, true, false);
+      *accel = views::Accelerator(app::VKEY_A, false, true, false);
       return true;
 
     default: