Split a part of code managing accelerators from views::FocusManager.

views/focus/focus_manager.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_FOCUS_FOCUS_MANAGER_H_
 #define VIEWS_FOCUS_FOCUS_MANAGER_H_
 #pragma once
 
 #include <list>
 #include <map>
 
 #include "base/basictypes.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "ui/base/models/accelerator.h"
 #include "ui/gfx/native_widget_types.h"
 #include "views/views_export.h"
 #include "views/events/event.h"
 
 // The FocusManager class is used to handle focus traversal, store/restore
 // focused views and handle keyboard accelerators.
 //
 // There are 2 types of focus:
@@ skipping 41 matching lines @@
 //   the parent view that directly contains the native window. This is needed
 //   when traversing up from the nested RootView to know which view to start
 //   with when going to the next/previous view.
 //   In our example:
 //   hwnd_view_container_->GetWidget()->SetFocusTraversableParent(
 //      native_control);
 //
 // Note that FocusTraversable do not have to be RootViews: AccessibleToolbarView
 // is FocusTraversable.
 
+namespace ui {
+class AcceleratorTarget;
+class AcceleratorManager;
+}
+
 namespace views {
 
 class FocusSearch;
 class RootView;
 class View;
 class Widget;
 
 // The FocusTraversable interface is used by components that want to process
 // focus traversal events (due to Tab/Shift-Tab key events).
 class VIEWS_EXPORT FocusTraversable {
@@ skipping 162 matching lines @@
   View* FindFocusableView(FocusTraversable* focus_traversable,
                           View* starting_view,
                           bool reverse);
 
   // The top-level Widget this FocusManager is associated with.
   Widget* widget_;
 
   // The view that currently is focused.
   View* focused_view_;
 
+  // The AcceleratorManager this FocusManager is associated with.
+  scoped_ptr<ui::AcceleratorManager> accelerator_manager_;
+
   // The storage id used in the ViewStorage to store/restore the view that last
   // had focus.
   int stored_focused_view_storage_id_;
 
   // The reason why the focus most recently changed.
   FocusChangeReason focus_change_reason_;
 
-  // The accelerators and associated targets.
-  typedef std::list<ui::AcceleratorTarget*> AcceleratorTargetList;
-  typedef std::map<ui::Accelerator, AcceleratorTargetList> AcceleratorMap;
-  AcceleratorMap accelerators_;
-
   // The list of registered FocusChange listeners.
   ObserverList<FocusChangeListener, true> focus_change_listeners_;
 
   // See description above getter.
   bool is_changing_focus_;
 
   DISALLOW_COPY_AND_ASSIGN(FocusManager);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_FOCUS_FOCUS_MANAGER_H_