| Index: ash/root_window_controller.h
|
| diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
|
| index d43cf3252571e593b97f76d1baa0bcc19fcaf4db..740d0802083fd91f3f2b2808949effa88ec2f419 100644
|
| --- a/ash/root_window_controller.h
|
| +++ b/ash/root_window_controller.h
|
| @@ -111,9 +111,7 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
|
| aura::Window* GetRootWindow();
|
| const aura::Window* GetRootWindow() const;
|
|
|
| - WorkspaceController* workspace_controller() {
|
| - return workspace_controller_.get();
|
| - }
|
| + WorkspaceController* workspace_controller();
|
|
|
| AlwaysOnTopController* always_on_top_controller() {
|
| return always_on_top_controller_.get();
|
| @@ -309,7 +307,6 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
|
| std::unique_ptr<AshTouchExplorationManager> touch_exploration_manager_;
|
| #endif
|
|
|
| - std::unique_ptr<WorkspaceController> workspace_controller_;
|
| std::unique_ptr<AlwaysOnTopController> always_on_top_controller_;
|
|
|
| // Heads-up displays for touch events. These HUDs are not owned by the root
|
|
|