| Index: ash/wm/session_state_animator_impl.cc
|
| diff --git a/ash/wm/session_state_animator_impl.cc b/ash/wm/session_state_animator_impl.cc
|
| index ca8d2ccd26b5229d4041e1269d2614ef009b1250..01242f45b178c949781c0b4ff433914986e2e429 100644
|
| --- a/ash/wm/session_state_animator_impl.cc
|
| +++ b/ash/wm/session_state_animator_impl.cc
|
| @@ -258,20 +258,18 @@ void StartGrayscaleBrightnessAnimationForWindow(
|
| ui::LayerAnimationObserver* observer) {
|
| ui::LayerAnimator* animator = window->layer()->GetAnimator();
|
|
|
| - scoped_ptr<ui::LayerAnimationSequence> brightness_sequence(
|
| + std::unique_ptr<ui::LayerAnimationSequence> brightness_sequence(
|
| new ui::LayerAnimationSequence());
|
| - scoped_ptr<ui::LayerAnimationSequence> grayscale_sequence(
|
| + std::unique_ptr<ui::LayerAnimationSequence> grayscale_sequence(
|
| new ui::LayerAnimationSequence());
|
|
|
| - scoped_ptr<ui::LayerAnimationElement> brightness_element(
|
| - ui::LayerAnimationElement::CreateBrightnessElement(
|
| - target, duration));
|
| + std::unique_ptr<ui::LayerAnimationElement> brightness_element(
|
| + ui::LayerAnimationElement::CreateBrightnessElement(target, duration));
|
| brightness_element->set_tween_type(tween_type);
|
| brightness_sequence->AddElement(brightness_element.release());
|
|
|
| - scoped_ptr<ui::LayerAnimationElement> grayscale_element(
|
| - ui::LayerAnimationElement::CreateGrayscaleElement(
|
| - target, duration));
|
| + std::unique_ptr<ui::LayerAnimationElement> grayscale_element(
|
| + ui::LayerAnimationElement::CreateGrayscaleElement(target, duration));
|
| grayscale_element->set_tween_type(tween_type);
|
| grayscale_sequence->AddElement(grayscale_element.release());
|
|
|
|
|