| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/web_contents/aura/window_slider.h" | 5 #include "content/browser/web_contents/aura/window_slider.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 translate_layer->SetTransform(transform); | 220 translate_layer->SetTransform(transform); |
| 221 } | 221 } |
| 222 | 222 |
| 223 delta_x_ = 0.f; | 223 delta_x_ = 0.f; |
| 224 } | 224 } |
| 225 | 225 |
| 226 void WindowSlider::SlideAnimationCompleted( | 226 void WindowSlider::SlideAnimationCompleted( |
| 227 scoped_ptr<ui::Layer> layer, scoped_ptr<ShadowLayerDelegate> shadow) { | 227 scoped_ptr<ui::Layer> layer, scoped_ptr<ShadowLayerDelegate> shadow) { |
| 228 active_animator_ = NULL; | 228 active_animator_ = NULL; |
| 229 shadow.reset(); | 229 shadow.reset(); |
| 230 layer.reset(); | 230 delegate_->OnWindowSlideCompleted(layer.Pass()); |
| 231 delegate_->OnWindowSlideCompleted(); | |
| 232 } | 231 } |
| 233 | 232 |
| 234 void WindowSlider::ResetSlideAnimationCompleted( | 233 void WindowSlider::ResetSlideAnimationCompleted( |
| 235 scoped_ptr<ui::Layer> layer, scoped_ptr<ShadowLayerDelegate> shadow) { | 234 scoped_ptr<ui::Layer> layer, scoped_ptr<ShadowLayerDelegate> shadow) { |
| 236 active_animator_ = NULL; | 235 active_animator_ = NULL; |
| 237 shadow.reset(); | 236 shadow.reset(); |
| 238 layer.reset(); | 237 layer.reset(); |
| 239 delegate_->OnWindowSlideAborted(); | 238 delegate_->OnWindowSlideAborted(); |
| 240 } | 239 } |
| 241 | 240 |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 301 } else if (window == owner_) { | 300 } else if (window == owner_) { |
| 302 window->RemoveObserver(this); | 301 window->RemoveObserver(this); |
| 303 owner_ = NULL; | 302 owner_ = NULL; |
| 304 delete this; | 303 delete this; |
| 305 } else { | 304 } else { |
| 306 NOTREACHED(); | 305 NOTREACHED(); |
| 307 } | 306 } |
| 308 } | 307 } |
| 309 | 308 |
| 310 } // namespace content | 309 } // namespace content |
| OLD | NEW |