Enable accelerators on web activity window

athena/input/accelerator_manager_impl.h

 // Copyright 2014 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 ATHENA_INPUT_ACCELERATOR_MANAGER_H_
 #define ATHENA_INPUT_ACCELERATOR_MANAGER_H_
 
 #include "athena/input/public/accelerator_manager.h"
 
 #include <map>
 
 #include "base/macros.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/events/event_target_iterator.h"
 
 namespace aura {
 class Window;
 }
 
-namespace ui {
-class AcceleratorManager;
-}
-
 namespace wm {
 class AcceleratorFilter;
 class NestedAcceleratorController;
 }
 
 namespace athena {
 
 // AcceleratorManagerImpl provides a API to register accelerators
 // for athena modules. It hides various details on accelerator handling
 // such as how to handle accelerator in a nested loop, reserved accelerators
 // and repeated accelerators.
 class AcceleratorManagerImpl : public AcceleratorManager,
                                public ui::AcceleratorTarget {
  public:
-  AcceleratorManagerImpl();
+  class AcceleratorWrapper;

[Jun Mukai, 2014/06/12 21:30:31]

then I think you should make this class decl to private

[oshima, 2014/06/12 22:35:23]

I unfortunately can't without exposing internal class as a friend that are
currently defined in anonymous namespace. 

[Jun Mukai, 2014/06/12 22:50:26]

Confused. Which one exactly you need to expose, and which class has to be
friend??  As I understand the code, AcceleratorWrapper is referred only from
AcceleratorManagerImpl, then it can be private. Am I missing something?

[oshima, 2014/06/12 23:11:01]

Subclasses (UIAcceleratorManagerWrapper, FocusManagerWrapper) need to acccess
it.

+
+  // Creates an AcceleratorManager for global accelerators.
+  // This is the one returned by AcceleratorManager::Get()
+  static AcceleratorManagerImpl* CreateGlobalAcceleratorManager();
+
+  // Creates an AcceleratorManager for focus manager.
+  static scoped_ptr<AcceleratorManager> CreateForFocusManager(
+      views::FocusManager* focus_manager);
+
   virtual ~AcceleratorManagerImpl();
 
   void Init();
 
   void OnRootWindowCreated(aura::Window* root_window);
 
-  bool IsRegistered(const ui::Accelerator& accelerator) const;
-  bool IsReserved(const ui::Accelerator& accelerator) const;
   bool Process(const ui::Accelerator& accelerator);
 
+  // AcceleratorManager:
+  // This is made public so that implementation classes can use this.
+  virtual bool IsRegistered(const ui::Accelerator& accelerator,
+                            int flags) const OVERRIDE;
+
  private:
+  class InternalData;
+
+  explicit AcceleratorManagerImpl(AcceleratorWrapper* wrapper);
+
   // AcceleratorManager:
   virtual void RegisterAccelerators(const AcceleratorData accelerators[],
                                     size_t num_accelerators,
                                     AcceleratorHandler* handler) OVERRIDE;
   virtual void SetDebugAcceleratorsEnabled(bool enabled) OVERRIDE;
 
   // ui::AcceleratorTarget:
   virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
   virtual bool CanHandleAccelerators() const OVERRIDE;
 
-  class InternalData;
-
   void RegisterAccelerator(const AcceleratorData& accelerator,
                            AcceleratorHandler* handler);
 
   std::map<ui::Accelerator, InternalData> accelerators_;
-  scoped_ptr<ui::AcceleratorManager> accelerator_manager_;
-
+  scoped_ptr<AcceleratorWrapper> accelerator_wrapper_;
   scoped_ptr<wm::AcceleratorFilter> accelerator_filter_;
   scoped_ptr<wm::NestedAcceleratorController> nested_accelerator_controller_;
-
   bool debug_accelerators_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(AcceleratorManagerImpl);
 };
 
 }  // namespace athena
 
 #endif  // ATHENA_INPUT_ACCELERATOR_MANAGER_H_