Re-lands 58186:

views/controls/menu/menu_win.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 "views/controls/menu/menu_win.h"
 
 #include <string>
 
+#include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
-#include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/font.h"
 #include "gfx/rect.h"
 #include "gfx/window_impl.h"
 #include "views/accelerator.h"
 
 namespace views {
@@ skipping 414 matching lines @@
 
   // Set the item data.
   MenuWin::ItemData* data = new ItemData;
   item_data_.push_back(data);
   data->submenu = submenu != NULL;
 
   std::wstring actual_label(label.empty() ?
       delegate()->GetLabel(item_id) : label);
 
   // Find out if there is a shortcut we need to append to the label.
-  views::Accelerator accelerator(base::VKEY_UNKNOWN, false, false, false);
+  views::Accelerator accelerator(app::VKEY_UNKNOWN, false, false, false);
   if (delegate() && delegate()->GetAcceleratorInfo(item_id, &accelerator)) {
     actual_label += L'\t';
     actual_label += accelerator.GetShortcutText();
   }
   labels_.push_back(actual_label);
 
   if (owner_draw_) {
     if (icon.width() != 0 && icon.height() != 0)
       data->icon = icon;
     else
@@ skipping 109 matching lines @@
       break;
 
     default:
       NOTREACHED();
       return 0;
   }
   return align_flags;
 }
 
 }  // namespace views