Move views::Accelerator to ui in order to use it from aura code.

views/controls/menu/menu_win.cc

 // Copyright (c) 2011 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 "base/logging.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
+#include "ui/base/models/accelerator.h"
 #include "ui/base/win/window_impl.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/rect.h"
-#include "views/accelerator.h"
 
 namespace views {
 
 // The width of an icon, including the pixels between the icon and
 // the item label.
 const int kIconWidth = 23;
 // Margins between the top of the item and the label.
 const int kItemTopMargin = 3;
 // Margins between the bottom of the item and the label.
 const int kItemBottomMargin = 4;
@@ skipping 405 matching lines @@
   mii.wID = item_id;
 
   // Set the item data.
   MenuWin::ItemData* data = new ItemData;
   item_data_.push_back(data);
   data->submenu = submenu != NULL;
 
   string16 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(ui::VKEY_UNKNOWN, false, false, false);
+  ui::Accelerator accelerator(ui::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