Index: ui/keyboard/keyboard_controller.cc |
diff --git a/ui/keyboard/keyboard_controller.cc b/ui/keyboard/keyboard_controller.cc |
index 5aa44bbbaf599bf7c431ec55456e8e7277092d80..dbb68b168663007cdb18d9c052a8cec24060499f 100644 |
--- a/ui/keyboard/keyboard_controller.cc |
+++ b/ui/keyboard/keyboard_controller.cc |
@@ -115,7 +115,7 @@ namespace keyboard { |
// KeyboardController. |
class CallbackAnimationObserver : public ui::LayerAnimationObserver { |
public: |
- CallbackAnimationObserver(ui::LayerAnimator* animator, |
+ CallbackAnimationObserver(scoped_refptr<ui::LayerAnimator> animator, |
sadrul
2015/04/27 18:56:16
const scoped_refptr<>&
bshe
2015/04/27 19:52:54
Done.
|
base::Callback<void(void)> callback); |
~CallbackAnimationObserver() override; |
@@ -125,14 +125,15 @@ class CallbackAnimationObserver : public ui::LayerAnimationObserver { |
void OnLayerAnimationAborted(ui::LayerAnimationSequence* seq) override; |
void OnLayerAnimationScheduled(ui::LayerAnimationSequence* seq) override {} |
- ui::LayerAnimator* animator_; |
+ scoped_refptr<ui::LayerAnimator> animator_; |
base::Callback<void(void)> callback_; |
DISALLOW_COPY_AND_ASSIGN(CallbackAnimationObserver); |
}; |
CallbackAnimationObserver::CallbackAnimationObserver( |
- ui::LayerAnimator* animator, base::Callback<void(void)> callback) |
+ scoped_refptr<ui::LayerAnimator> animator, |
+ base::Callback<void(void)> callback) |
: animator_(animator), callback_(callback) { |
} |