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

Unified Diff: ui/aura_shell/shell.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
Index: ui/aura_shell/shell.h
diff --git a/ui/aura_shell/shell.h b/ui/aura_shell/shell.h
index 1b4c719f3c7af0f3bcbacd60ee931de3c12df6cf..559c43f4de8e05ad7f856d2fc66e8defb0aa061d 100644
--- a/ui/aura_shell/shell.h
+++ b/ui/aura_shell/shell.h
@@ -22,6 +22,9 @@ class Window;
namespace gfx {
class Rect;
}
+namespace ui {
+class AcceleratorManager;
+}
namespace aura_shell {
@@ -58,6 +61,11 @@ class AURA_SHELL_EXPORT Shell {
ShellDelegate* delegate() { return delegate_.get(); }
Launcher* launcher() { return launcher_.get(); }
+ // Returns the AcceleratorManager that managers global keyboard shortcuts.
+ ui::AcceleratorManager* accelerator_manager() {
+ return accelerator_manager_.get();
+ }
+
private:
typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair;
@@ -82,6 +90,8 @@ class AURA_SHELL_EXPORT Shell {
scoped_ptr<internal::WorkspaceController> workspace_controller_;
scoped_ptr<internal::ShelfLayoutController> shelf_layout_controller_;
+ scoped_ptr<ui::AcceleratorManager> accelerator_manager_;
+
DISALLOW_COPY_AND_ASSIGN(Shell);
};

Powered by Google App Engine
This is Rietveld 408576698