| Index: ash/system/tray/system_tray_bubble.cc
|
| diff --git a/ash/system/tray/system_tray_bubble.cc b/ash/system/tray/system_tray_bubble.cc
|
| index eab4b1cf98a0d3fba611c8f35d8b1b3713cb410d..f51bbe19e15951f3fb73dedff506840aa6ad627d 100644
|
| --- a/ash/system/tray/system_tray_bubble.cc
|
| +++ b/ash/system/tray/system_tray_bubble.cc
|
| @@ -53,7 +53,7 @@ class AnimationObserverDeleteLayer : public ui::ImplicitAnimationObserver {
|
| }
|
|
|
| private:
|
| - scoped_ptr<ui::Layer> layer_;
|
| + std::unique_ptr<ui::Layer> layer_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AnimationObserverDeleteLayer);
|
| };
|
| @@ -85,7 +85,7 @@ void SystemTrayBubble::UpdateView(
|
| BubbleType bubble_type) {
|
| DCHECK(bubble_type != BUBBLE_TYPE_NOTIFICATION);
|
|
|
| - scoped_ptr<ui::Layer> scoped_layer;
|
| + std::unique_ptr<ui::Layer> scoped_layer;
|
| if (bubble_type != bubble_type_) {
|
| base::TimeDelta swipe_duration =
|
| base::TimeDelta::FromMilliseconds(kSwipeDelayMS);
|
|
|