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;
+
+  // Creates an AcceleratorManager for global accelerators.
+  // This is the one returned by AcceleratorManager::Get()
+  static AcceleratorManagerImpl* CreateGlobalAcceleratorManager();
+
+  explicit AcceleratorManagerImpl(AcceleratorWrapper* wrapper);

[Jun Mukai, 2014/06/11 22:07:51]

I am not sure what this means.  Who can call this method?
Can it be a private constructor?

[oshima, 2014/06/11 22:46:43]

Sorry I didn't understand your question.
This is called in AcceleratorManager::CreateForFocusmanager(). I did have a
static method to create CreateForFocusmanager with private ctor, but I thought
it's overkill. I can change it back if you want. let me know.

[Jun Mukai, 2014/06/11 23:13:22]

Ah, it must be called from a static method of its superclass and that's why it's
public.

I don't think this is a good design, but can't find better ones.

   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:
   // 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);
 
+  class InternalData;

[Jun Mukai, 2014/06/11 22:07:51]

nit: internal class declaration usually appears right after 'private:' (same as
typedefs and enums, IIUC)

[oshima, 2014/06/11 22:46:43]

Done.

   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_