| Index: ui/aura_shell/shell.h
|
| diff --git a/ui/aura_shell/shell.h b/ui/aura_shell/shell.h
|
| index 53a3c3b48b01a96330f498fed1f0b8e183908f2c..9ec316f75634a7dff6c68c8027d744199f0dd74d 100644
|
| --- a/ui/aura_shell/shell.h
|
| +++ b/ui/aura_shell/shell.h
|
| @@ -35,7 +35,7 @@ namespace internal {
|
| class AppList;
|
| class DragDropController;
|
| class ShadowController;
|
| -class ShelfLayoutController;
|
| +class ShelfLayoutManager;
|
| class ShellAcceleratorFilter;
|
| class WorkspaceController;
|
| }
|
| @@ -112,7 +112,7 @@ class AURA_SHELL_EXPORT Shell {
|
|
|
| scoped_ptr<internal::DragDropController> drag_drop_controller_;
|
| scoped_ptr<internal::WorkspaceController> workspace_controller_;
|
| - scoped_ptr<internal::ShelfLayoutController> shelf_layout_controller_;
|
| + scoped_ptr<internal::ShelfLayoutManager> shelf_layout_manager_;
|
| scoped_ptr<internal::ShadowController> shadow_controller_;
|
|
|
| // An event filter that pre-handles global accelerators.
|
|
|