Index: chrome/browser/extensions/global_shortcut_listener_chromeos.h |
diff --git a/chrome/browser/extensions/global_shortcut_listener_chromeos.h b/chrome/browser/extensions/global_shortcut_listener_chromeos.h |
index e9055214061e92485b7c3d6877e4e69135828712..a5c0641e3fb2f5d753013249274f5f0a0213594b 100644 |
--- a/chrome/browser/extensions/global_shortcut_listener_chromeos.h |
+++ b/chrome/browser/extensions/global_shortcut_listener_chromeos.h |
@@ -7,15 +7,15 @@ |
#include "chrome/browser/extensions/global_shortcut_listener.h" |
-// TODO(finnur): Figure out what to do on ChromeOS, where the Commands API kind |
-// of is global already... |
+#include "ui/base/accelerators/accelerator.h" |
namespace extensions { |
// ChromeOS-specific implementation of the GlobalShortcutListener class that |
// listens for global shortcuts. Handles basic keyboard intercepting and |
// forwards its output to the base class for processing. |
-class GlobalShortcutListenerChromeOS : public GlobalShortcutListener { |
+class GlobalShortcutListenerChromeOS : public GlobalShortcutListener, |
+ ui::AcceleratorTarget { |
public: |
GlobalShortcutListenerChromeOS(); |
virtual ~GlobalShortcutListenerChromeOS(); |
@@ -29,6 +29,10 @@ class GlobalShortcutListenerChromeOS : public GlobalShortcutListener { |
virtual void UnregisterAcceleratorImpl( |
const ui::Accelerator& accelerator) OVERRIDE; |
+ // ui::AcceleratorTarget implementation. |
+ virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; |
+ virtual bool CanHandleAccelerators() const OVERRIDE; |
+ |
// Whether this object is listening for global shortcuts. |
bool is_listening_; |