Chromium Code Reviews| Index: ash/root_window_controller.h |
| diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h |
| index 4fbef3f1a27642aedc3feabc92d39df9a70b0136..d82d076467e2ceb6f0810f1d4474cb12c85b4c4c 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(); |
|
msw
2016/08/30 17:46:20
nit: GetWorkspaceController? (ok as-is temporarily
sky
2016/08/30 17:55:09
The style guide says this about function names "Fu
|
| AlwaysOnTopController* always_on_top_controller() { |
| return always_on_top_controller_.get(); |
| @@ -308,7 +306,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 |