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

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 tfarina's 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 | « ui/aura_shell/desktop_event_filter.cc ('k') | ui/aura_shell/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/shell.h
diff --git a/ui/aura_shell/shell.h b/ui/aura_shell/shell.h
index 75643c558c75ae3b6aa2cb766d880dd1f484b804..c74fb6c80213e597371a5ac2beef8825ba718430 100644
--- a/ui/aura_shell/shell.h
+++ b/ui/aura_shell/shell.h
@@ -27,6 +27,7 @@ class Rect;
namespace aura_shell {
class Launcher;
+class ShellAcceleratorController;
class ShellDelegate;
namespace internal {
@@ -60,6 +61,9 @@ class AURA_SHELL_EXPORT Shell {
// Toggles between overview mode and normal mode.
void ToggleOverview();
+ ShellAcceleratorController* accelerator_controller() {
+ return accelerator_controller_.get();
+ }
ShellDelegate* delegate() { return delegate_.get(); }
Launcher* launcher() { return launcher_.get(); }
@@ -80,6 +84,8 @@ class AURA_SHELL_EXPORT Shell {
base::WeakPtrFactory<Shell> method_factory_;
+ scoped_ptr<ShellAcceleratorController> accelerator_controller_;
+
scoped_ptr<ShellDelegate> delegate_;
scoped_ptr<Launcher> launcher_;
« no previous file with comments | « ui/aura_shell/desktop_event_filter.cc ('k') | ui/aura_shell/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698