| Index: ui/aura_shell/shell.h
|
| ===================================================================
|
| --- ui/aura_shell/shell.h (revision 110642)
|
| +++ ui/aura_shell/shell.h (working copy)
|
| @@ -27,7 +27,6 @@
|
| namespace aura_shell {
|
|
|
| class Launcher;
|
| -class ShellAcceleratorController;
|
| class ShellDelegate;
|
|
|
| namespace internal {
|
| @@ -62,9 +61,6 @@
|
| // 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(); }
|
|
|
| @@ -85,8 +81,6 @@
|
|
|
| base::WeakPtrFactory<Shell> method_factory_;
|
|
|
| - scoped_ptr<ShellAcceleratorController> accelerator_controller_;
|
| -
|
| scoped_ptr<ShellDelegate> delegate_;
|
|
|
| scoped_ptr<Launcher> launcher_;
|
|
|