| Index: chrome/browser/ui/window_sizer/window_sizer.cc
|
| diff --git a/chrome/browser/ui/window_sizer/window_sizer.cc b/chrome/browser/ui/window_sizer/window_sizer.cc
|
| index b54a2312f36edb5837a433918dacb789258aee77..3921e5088dc464626215bb85293d8b46ff252f12 100644
|
| --- a/chrome/browser/ui/window_sizer/window_sizer.cc
|
| +++ b/chrome/browser/ui/window_sizer/window_sizer.cc
|
| @@ -175,8 +175,8 @@ class DefaultTargetDisplayProvider : public WindowSizer::TargetDisplayProvider {
|
| // WindowSizer, public:
|
|
|
| WindowSizer::WindowSizer(
|
| - scoped_ptr<StateProvider> state_provider,
|
| - scoped_ptr<TargetDisplayProvider> target_display_provider,
|
| + std::unique_ptr<StateProvider> state_provider,
|
| + std::unique_ptr<TargetDisplayProvider> target_display_provider,
|
| const Browser* browser)
|
| : state_provider_(std::move(state_provider)),
|
| target_display_provider_(std::move(target_display_provider)),
|
| @@ -184,8 +184,8 @@ WindowSizer::WindowSizer(
|
| browser_(browser) {}
|
|
|
| WindowSizer::WindowSizer(
|
| - scoped_ptr<StateProvider> state_provider,
|
| - scoped_ptr<TargetDisplayProvider> target_display_provider,
|
| + std::unique_ptr<StateProvider> state_provider,
|
| + std::unique_ptr<TargetDisplayProvider> target_display_provider,
|
| gfx::Screen* screen,
|
| const Browser* browser)
|
| : state_provider_(std::move(state_provider)),
|
| @@ -205,9 +205,9 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState(
|
| const Browser* browser,
|
| gfx::Rect* window_bounds,
|
| ui::WindowShowState* show_state) {
|
| - scoped_ptr<StateProvider> state_provider(
|
| + std::unique_ptr<StateProvider> state_provider(
|
| new DefaultStateProvider(app_name, browser));
|
| - scoped_ptr<TargetDisplayProvider> target_display_provider(
|
| + std::unique_ptr<TargetDisplayProvider> target_display_provider(
|
| new DefaultTargetDisplayProvider);
|
| const WindowSizer sizer(std::move(state_provider),
|
| std::move(target_display_provider), browser);
|
|
|