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

chrome/browser/ui/views/frame/browser_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 CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 48 matching lines @@
 
 #if defined(OS_WIN)
 class AeroPeekManager;
 class JumpList;
 #endif
 
 #if defined(USE_AURA)
 class LauncherIconUpdater;
 #endif
 
+namespace ui {
+class Accelerator;
+}
+
 namespace views {
 class AccessiblePaneView;
 class ExternalFocusTracker;
 class Menu;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView
 //
 //  A ClientView subclass that provides the contents of a browser window,
@@ skipping 76 matching lines @@
   virtual bool IsTabStripVisible() const;
 
   // Returns true if the profile associated with this Browser window is
   // incognito.
   bool IsOffTheRecord() const;
 
   // Returns true if the non-client view should render an avatar icon.
   virtual bool ShouldShowAvatar() const;
 
   // Handle the specified |accelerator| being pressed.
-  virtual bool AcceleratorPressed(const views::Accelerator& accelerator);
+  virtual bool AcceleratorPressed(const ui::Accelerator& accelerator);
 
   // Provides the containing frame with the accelerator for the specified
   // command id. This can be used to provide menu item shortcut hints etc.
   // Returns true if an accelerator was found for the specified |cmd_id|, false
   // otherwise.
   bool GetAccelerator(int cmd_id, ui::Accelerator* accelerator);
 
   // Shows the next app-modal dialog box, if there is one to be shown, or moves
   // an existing showing one to the front. Returns true if one was shown or
   // activated, false if none was shown.
@@ skipping 365 matching lines @@
 
   // Retrieves the command id for the specified Windows app command.
   int GetCommandIDForAppCommandID(int app_command_id) const;
 
   // Initialize the hung plugin detector.
   void InitHangMonitor();
 
   // Possibly records a user metrics action corresponding to the passed-in
   // accelerator.  Only implemented for Chrome OS, where we're interested in
   // learning about how frequently the top-row keys are used.
-  void UpdateAcceleratorMetrics(const views::Accelerator& accelerator,
+  void UpdateAcceleratorMetrics(const ui::Accelerator& accelerator,
                                 int command_id);
 
   // Invoked from ActiveTabChanged or when instant is made active.
   // |new_contents| must not be NULL.
   void ProcessTabSelected(TabContentsWrapper* new_contents);
 
   // Exposes resize corner size to BrowserViewLayout.
   gfx::Size GetResizeCornerSize() const;
 
   // Shows the about chrome modal dialog and returns the Window object.
@@ skipping 97 matching lines @@
 
   // Tracks and stores the last focused view which is not the
   // devtools_container_ or any of its children. Used to restore focus once
   // the devtools_container_ is hidden.
   scoped_ptr<views::ExternalFocusTracker> devtools_focus_tracker_;
 
   // The Status information bubble that appears at the bottom of the window.
   scoped_ptr<StatusBubbleViews> status_bubble_;
 
   // A mapping between accelerators and commands.
-  std::map<views::Accelerator, int> accelerator_table_;
+  std::map<ui::Accelerator, int> accelerator_table_;
 
   // True if we have already been initialized.
   bool initialized_;
 
   // True if we should ignore requests to layout.  This is set while toggling
   // fullscreen mode on and off to reduce jankiness.
   bool ignore_layout_;
 
   scoped_ptr<FullscreenExitBubbleViews> fullscreen_bubble_;
 
@@ skipping 42 matching lines @@
   // If this flag is set then SetFocusToLocationBar() will set focus to the
   // location bar even if the browser window is not active.
   bool force_location_bar_focus_;
 
   PendingFullscreenRequest fullscreen_request_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_