Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(94)

Unified Diff: ui/aura/desktop.h

Issue 8465021: Add ShellAcceleratorController that managers global keyboard accelerators. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address comments Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/aura/desktop.cc » ('j') | ui/aura/desktop.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/desktop.h
diff --git a/ui/aura/desktop.h b/ui/aura/desktop.h
index 8ba752a5778a636f530016c4533eac1bbd2ceab2..d5970be4971976e98b83d7f5c331cc27fa16c9d6 100644
--- a/ui/aura/desktop.h
+++ b/ui/aura/desktop.h
@@ -16,6 +16,7 @@
#include "ui/aura/focus_manager.h"
#include "ui/aura/window.h"
#include "ui/base/events.h"
+#include "ui/base/models/accelerator.h"
#include "ui/gfx/compositor/compositor.h"
#include "ui/gfx/compositor/layer_animation_observer.h"
#include "ui/gfx/native_widget_types.h"
@@ -26,6 +27,7 @@ class Size;
}
namespace ui {
+class AcceleratorManager;
class LayerAnimationSequence;
class Transform;
}
@@ -44,7 +46,8 @@ class TouchEvent;
class AURA_EXPORT Desktop : public ui::CompositorDelegate,
public Window,
public internal::FocusManager,
- public ui::LayerAnimationObserver {
+ public ui::LayerAnimationObserver,
+ public ui::AcceleratorTarget {
public:
Desktop();
virtual ~Desktop();
@@ -125,6 +128,12 @@ class AURA_EXPORT Desktop : public ui::CompositorDelegate,
// Are any mouse buttons currently down?
bool IsMouseButtonDown() const;
+ // Register accelerators for the desktop.
+ void RegisterAccelerators(ui::AcceleratorManager* accelerator_manager);
+
+ // Overridden from ui::AcceleratorTarget.
Ben Goodger (Google) 2011/11/15 16:28:09 : on the end, rather than .
mazda 2011/11/16 05:40:08 Done.
+ virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
+
// Capture -------------------------------------------------------------------
// Sets capture to the specified window.
« no previous file with comments | « no previous file | ui/aura/desktop.cc » ('j') | ui/aura/desktop.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698