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

views/view.h

 // 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.
 
 #ifndef VIEWS_VIEW_H_
 #define VIEWS_VIEW_H_
 #pragma once
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
+#include "ui/base/models/accelerator.h"
 #include "ui/gfx/compositor/layer_delegate.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
-#include "views/accelerator.h"
 #include "views/background.h"
 #include "views/border.h"
+#include "views/events/event.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_comptr.h"
 #endif
 
 using ui::OSExchangeData;
 
 namespace gfx {
 class Canvas;
 class Insets;
@@ skipping 54 matching lines @@
 //   LayoutManager interface can be used to lay out children if required.
 //
 //   It is up to the subclass to implement Painting and storage of subclass -
 //   specific properties and functionality.
 //
 //   Unless otherwise documented, views is not thread safe and should only be
 //   accessed from the main thread.
 //
 /////////////////////////////////////////////////////////////////////////////
 class VIEWS_EXPORT View : public ui::LayerDelegate,
-                          public AcceleratorTarget {
+                          public ui::AcceleratorTarget {
  public:
   typedef std::vector<View*> Views;
 
   // TO BE MOVED ---------------------------------------------------------------
   // TODO(beng): These methods are to be moved to other files/classes.
 
   // TODO(beng): delete
   // Set whether this view is hottracked. A disabled view cannot be hottracked.
   // If flag differs from the current value, SchedulePaint is invoked.
   virtual void SetHotTracked(bool flag);
@@ skipping 517 matching lines @@
   // Widget that contains this view. Returns NULL if this view is not part of a
   // view hierarchy with a Widget.
   virtual InputMethod* GetInputMethod();
 
   // Accelerators --------------------------------------------------------------
 
   // Sets a keyboard accelerator for that view. When the user presses the
   // accelerator key combination, the AcceleratorPressed method is invoked.
   // Note that you can set multiple accelerators for a view by invoking this
   // method several times.
-  virtual void AddAccelerator(const Accelerator& accelerator);
+  virtual void AddAccelerator(const ui::Accelerator& accelerator);
 
   // Removes the specified accelerator for this view.
-  virtual void RemoveAccelerator(const Accelerator& accelerator);
+  virtual void RemoveAccelerator(const ui::Accelerator& accelerator);
 
   // Removes all the keyboard accelerators for this view.
   virtual void ResetAccelerators();
 
   // Overridden from AcceleratorTarget:
-  virtual bool AcceleratorPressed(const Accelerator& accelerator) OVERRIDE;
+  virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
 
   // Focus ---------------------------------------------------------------------
 
   // Returns whether this view currently has the focus.
   virtual bool HasFocus() const;
 
   // Returns the view that should be selected next when pressing Tab.
   View* GetNextFocusableView();
   const View* GetNextFocusableView() const;
 
@@ skipping 744 matching lines @@
   // true if when we were added to hierarchy we were without focus manager
   // attempt addition when ancestor chain changed.
   bool accelerator_registration_delayed_;
 
   // Focus manager accelerators registered on.
   FocusManager* accelerator_focus_manager_;
 
   // The list of accelerators. List elements in the range
   // [0, registered_accelerator_count_) are already registered to FocusManager,
   // and the rest are not yet.
-  scoped_ptr<std::vector<Accelerator> > accelerators_;
+  scoped_ptr<std::vector<ui::Accelerator> > accelerators_;
   size_t registered_accelerator_count_;
 
   // Focus ---------------------------------------------------------------------
 
   // Next view to be focused when the Tab key is pressed.
   View* next_focusable_view_;
 
   // Next view to be focused when the Shift-Tab key combination is pressed.
   View* previous_focusable_view_;
 
@@ skipping 20 matching lines @@
   base::win::ScopedComPtr<NativeViewAccessibilityWin>
       native_view_accessibility_win_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(View);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_VIEW_H_