| Index: ash/mus/sysui_application.cc
|
| diff --git a/ash/mus/sysui_application.cc b/ash/mus/sysui_application.cc
|
| index 92302485d160fb25dfd6b507f008afd9812dc1ea..5ebccd3e7927e09d0bb390a534a6706b401b4108 100644
|
| --- a/ash/mus/sysui_application.cc
|
| +++ b/ash/mus/sysui_application.cc
|
| @@ -88,7 +88,7 @@ class AshWindowTreeHostMus : public AshWindowTreeHostPlatform {
|
| public:
|
| explicit AshWindowTreeHostMus(const gfx::Rect& initial_bounds)
|
| : AshWindowTreeHostPlatform() {
|
| - scoped_ptr<ui::PlatformWindow> window(new ui::StubWindow(this));
|
| + std::unique_ptr<ui::PlatformWindow> window(new ui::StubWindow(this));
|
| window->SetBounds(initial_bounds);
|
| SetPlatformWindow(std::move(window));
|
| }
|
| @@ -275,9 +275,9 @@ class AshInit {
|
|
|
| private:
|
| scoped_refptr<base::SequencedWorkerPool> worker_pool_;
|
| - scoped_ptr<views::AuraInit> aura_init_;
|
| + std::unique_ptr<views::AuraInit> aura_init_;
|
| ShellDelegateMus* ash_delegate_ = nullptr;
|
| - scoped_ptr<NativeWidgetFactory> native_widget_factory_;
|
| + std::unique_ptr<NativeWidgetFactory> native_widget_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AshInit);
|
| };
|
|
|