| 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_;
|
|
|