| Index: ash/display/display_configuration_controller.h
|
| diff --git a/ash/display/display_configuration_controller.h b/ash/display/display_configuration_controller.h
|
| index 2256b6db5469d93533e153967c02aea9b67c4b0a..c91d9d87c84e245cef3e13fc9db397df3fb3f2a3 100644
|
| --- a/ash/display/display_configuration_controller.h
|
| +++ b/ash/display/display_configuration_controller.h
|
| @@ -41,7 +41,7 @@ class ASH_EXPORT DisplayConfigurationController
|
| // Sets the layout for the current displays with a fade in/out
|
| // animation. Currently |display_id| is assumed to be the secondary
|
| // display. TODO(oshima/stevenjb): Support 3+ displays.
|
| - void SetDisplayLayout(scoped_ptr<display::DisplayLayout> layout,
|
| + void SetDisplayLayout(std::unique_ptr<display::DisplayLayout> layout,
|
| bool user_action);
|
|
|
| // Sets the mirror mode with a fade-in/fade-out animation. Affects all
|
| @@ -73,14 +73,14 @@ class ASH_EXPORT DisplayConfigurationController
|
| // *before* starting any animations.
|
| void SetThrottleTimeout(int64_t throttle_ms);
|
| bool IsLimited();
|
| - void SetDisplayLayoutImpl(scoped_ptr<display::DisplayLayout> layout);
|
| + void SetDisplayLayoutImpl(std::unique_ptr<display::DisplayLayout> layout);
|
| void SetMirrorModeImpl(bool mirror);
|
| void SetPrimaryDisplayIdImpl(int64_t display_id);
|
|
|
| DisplayManager* display_manager_; // weak ptr
|
| WindowTreeHostManager* window_tree_host_manager_; // weak ptr
|
| - scoped_ptr<DisplayAnimator> display_animator_;
|
| - scoped_ptr<DisplayChangeLimiter> limiter_;
|
| + std::unique_ptr<DisplayAnimator> display_animator_;
|
| + std::unique_ptr<DisplayChangeLimiter> limiter_;
|
|
|
| base::WeakPtrFactory<DisplayConfigurationController> weak_ptr_factory_;
|
|
|
|
|