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

views/view.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/view.h"
 
 #include <algorithm>
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 786 matching lines @@
   return NULL;
 }
 
 InputMethod* View::GetInputMethod() {
   Widget* widget = GetWidget();
   return widget ? widget->GetInputMethod() : NULL;
 }
 
 // Accelerators ----------------------------------------------------------------
 
-void View::AddAccelerator(const Accelerator& accelerator) {
+void View::AddAccelerator(const ui::Accelerator& accelerator) {
   if (!accelerators_.get())
-    accelerators_.reset(new std::vector<Accelerator>());
+    accelerators_.reset(new std::vector<ui::Accelerator>());
 
   DCHECK(std::find(accelerators_->begin(), accelerators_->end(), accelerator) ==
       accelerators_->end())
       << "Registering the same accelerator multiple times";
 
   accelerators_->push_back(accelerator);
   RegisterPendingAccelerators();
 }
 
-void View::RemoveAccelerator(const Accelerator& accelerator) {
+void View::RemoveAccelerator(const ui::Accelerator& accelerator) {
   if (!accelerators_.get()) {
     NOTREACHED() << "Removing non-existing accelerator";
     return;
   }
 
-  std::vector<Accelerator>::iterator i(
+  std::vector<ui::Accelerator>::iterator i(
       std::find(accelerators_->begin(), accelerators_->end(), accelerator));
   if (i == accelerators_->end()) {
     NOTREACHED() << "Removing non-existing accelerator";
     return;
   }
 
   size_t index = i - accelerators_->begin();
   accelerators_->erase(i);
   if (index >= registered_accelerator_count_) {
     // The accelerator is not registered to FocusManager.
     return;
   }
   --registered_accelerator_count_;
 
   // Providing we are attached to a Widget and registered with a focus manager,
   // we should de-register from that focus manager now.
   if (GetWidget() && accelerator_focus_manager_)
     accelerator_focus_manager_->UnregisterAccelerator(accelerator, this);
 }
 
 void View::ResetAccelerators() {
   if (accelerators_.get())
     UnregisterAccelerators(false);
 }
 
-bool View::AcceleratorPressed(const Accelerator& accelerator) {
+bool View::AcceleratorPressed(const ui::Accelerator& accelerator) {
   return false;
 }
 
 // Focus -----------------------------------------------------------------------
 
 bool View::HasFocus() const {
   const FocusManager* focus_manager = GetFocusManager();
   return focus_manager && (focus_manager->GetFocusedView() == this);
 }
 
@@ skipping 1092 matching lines @@
     //                NOTREACHED assertion and verify accelerators works as
     //                expected.
 #if defined(OS_WIN)
     NOTREACHED();
 #endif
     return;
   }
   // Only register accelerators if we are visible.
   if (!IsVisibleInRootView() || !GetWidget()->IsVisible())
     return;
-  for (std::vector<Accelerator>::const_iterator i(
+  for (std::vector<ui::Accelerator>::const_iterator i(
            accelerators_->begin() + registered_accelerator_count_);
        i != accelerators_->end(); ++i) {
     accelerator_focus_manager_->RegisterAccelerator(*i, this);
   }
   registered_accelerator_count_ = accelerators_->size();
 }
 
 void View::UnregisterAccelerators(bool leave_data_intact) {
   if (!accelerators_.get())
     return;
@@ skipping 92 matching lines @@
 
   OSExchangeData data;
   WriteDragData(press_pt, &data);
 
   // Message the RootView to do the drag and drop. That way if we're removed
   // the RootView can detect it and avoid calling us back.
   GetWidget()->RunShellDrag(this, data, drag_operations);
 }
 
 }  // namespace views