| Index: ash/system/tray/tray_background_view.h
|
| diff --git a/ash/system/tray/tray_background_view.h b/ash/system/tray/tray_background_view.h
|
| index ef391348c1a407684e659eabbfb30b4320fec61d..2551faac6af03c5c3f96eca1f197ea68d04e2bdc 100644
|
| --- a/ash/system/tray/tray_background_view.h
|
| +++ b/ash/system/tray/tray_background_view.h
|
| @@ -188,8 +188,8 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView,
|
| // differently if set to true.
|
| bool draw_background_as_active_;
|
|
|
| - scoped_ptr<TrayWidgetObserver> widget_observer_;
|
| - scoped_ptr<TrayEventFilter> tray_event_filter_;
|
| + std::unique_ptr<TrayWidgetObserver> widget_observer_;
|
| + std::unique_ptr<TrayEventFilter> tray_event_filter_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView);
|
| };
|
|
|