| Index: ash/wm/workspace/workspace_manager.cc
|
| diff --git a/ash/wm/workspace/workspace_manager.cc b/ash/wm/workspace/workspace_manager.cc
|
| index 2378dd156dc56d6d5d911019012c7fe6add66922..ad4d5fdafbed2bb1070c271feb3060f58543e792 100644
|
| --- a/ash/wm/workspace/workspace_manager.cc
|
| +++ b/ash/wm/workspace/workspace_manager.cc
|
| @@ -341,7 +341,7 @@ void WorkspaceManager::SetActiveWorkspace(Workspace* workspace,
|
|
|
| // It is possible for a user to use accelerator keys to restore windows etc
|
| // while the user is cycling through workspaces.
|
| - if (workspace_cycler_.get())
|
| + if (workspace_cycler_)
|
| workspace_cycler_->AbortCycling();
|
|
|
| pending_workspaces_.erase(workspace);
|
| @@ -422,7 +422,7 @@ void WorkspaceManager::MoveWorkspaceToPendingOrDelete(
|
|
|
| // The user may have closed or minimized a window via accelerator keys while
|
| // cycling through workspaces.
|
| - if (workspace_cycler_.get())
|
| + if (workspace_cycler_)
|
| workspace_cycler_->AbortCycling();
|
|
|
| if (workspace == active_workspace_)
|
|
|