Chromium Code Reviews| Index: ui/aura_shell/shell.h |
| diff --git a/ui/aura_shell/shell.h b/ui/aura_shell/shell.h |
| index 75643c558c75ae3b6aa2cb766d880dd1f484b804..425e20020fb199c376e219537e10fe22d54ed8e9 100644 |
| --- a/ui/aura_shell/shell.h |
| +++ b/ui/aura_shell/shell.h |
| @@ -26,8 +26,9 @@ class Rect; |
| namespace aura_shell { |
| -class Launcher; |
| +class ShellAcceleratorController; |
| class ShellDelegate; |
| +class Launcher; |
|
tfarina
2011/11/17 12:49:55
Launcher should be first ;) sort up!
mazda
2011/11/17 13:10:16
Done.
|
| namespace internal { |
| class ShelfLayoutController; |
| @@ -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_; |