| Index: chrome/browser/extensions/api/tabs/app_window_controller.cc
|
| diff --git a/chrome/browser/extensions/api/tabs/app_window_controller.cc b/chrome/browser/extensions/api/tabs/app_window_controller.cc
|
| index 2e326a26d46d5f68db9a63baa62edbc36d8a1905..3e708e4f49447303aeeeb1b89a7dff03a61b5f33 100644
|
| --- a/chrome/browser/extensions/api/tabs/app_window_controller.cc
|
| +++ b/chrome/browser/extensions/api/tabs/app_window_controller.cc
|
| @@ -21,9 +21,10 @@
|
|
|
| namespace extensions {
|
|
|
| -AppWindowController::AppWindowController(AppWindow* app_window,
|
| - scoped_ptr<AppBaseWindow> base_window,
|
| - Profile* profile)
|
| +AppWindowController::AppWindowController(
|
| + AppWindow* app_window,
|
| + std::unique_ptr<AppBaseWindow> base_window,
|
| + Profile* profile)
|
| : WindowController(base_window.get(), profile),
|
| app_window_(app_window),
|
| base_window_(std::move(base_window)) {
|
| @@ -65,7 +66,7 @@ base::DictionaryValue* AppWindowController::CreateTabValue(
|
| return CreateTabObject(extension, tab_index)->ToValue().release();
|
| }
|
|
|
| -scoped_ptr<api::tabs::Tab> AppWindowController::CreateTabObject(
|
| +std::unique_ptr<api::tabs::Tab> AppWindowController::CreateTabObject(
|
| const extensions::Extension* extension,
|
| int tab_index) const {
|
| if (tab_index > 0)
|
| @@ -75,7 +76,7 @@ scoped_ptr<api::tabs::Tab> AppWindowController::CreateTabObject(
|
| if (!web_contents)
|
| return nullptr;
|
|
|
| - scoped_ptr<api::tabs::Tab> tab_object(new api::tabs::Tab);
|
| + std::unique_ptr<api::tabs::Tab> tab_object(new api::tabs::Tab);
|
| tab_object->id.reset(new int(SessionTabHelper::IdForTab(web_contents)));
|
| tab_object->index = 0;
|
| tab_object->window_id =
|
|
|