| Index: ash/wm/workspace/workspace_cycler.cc
|
| diff --git a/ash/wm/workspace/workspace_cycler.cc b/ash/wm/workspace/workspace_cycler.cc
|
| index 67319937b6c089718e10cf2bf1488e173ba60d14..a00926c08eb26e7c921a3e074ce02190306822a3 100644
|
| --- a/ash/wm/workspace/workspace_cycler.cc
|
| +++ b/ash/wm/workspace/workspace_cycler.cc
|
| @@ -61,12 +61,12 @@ void WorkspaceCycler::SetState(State new_state) {
|
| animator_.get());
|
| animator_->AnimateStartingCycler();
|
| } else if (new_state == STOPPING_CYCLING) {
|
| - if (animator_.get())
|
| + if (animator_)
|
| animator_->AnimateStoppingCycler();
|
| } else if (new_state == NOT_CYCLING) {
|
| scroll_x_ = 0.0f;
|
| scroll_y_ = 0.0f;
|
| - if (animator_.get()) {
|
| + if (animator_) {
|
| animator_->AbortAnimations();
|
| animator_.reset();
|
| }
|
|
|