| Index: chrome/browser/extensions/api/tabs/app_window_controller.h
|
| diff --git a/chrome/browser/extensions/api/tabs/app_window_controller.h b/chrome/browser/extensions/api/tabs/app_window_controller.h
|
| index 437e1810b0dc6f3e7a57de9414d994803f9ff4ae..78f81839624125d53aa6f04c9cd65a13312d7afc 100644
|
| --- a/chrome/browser/extensions/api/tabs/app_window_controller.h
|
| +++ b/chrome/browser/extensions/api/tabs/app_window_controller.h
|
| @@ -22,7 +22,7 @@ class AppBaseWindow;
|
| class AppWindowController : public WindowController {
|
| public:
|
| AppWindowController(AppWindow* window,
|
| - scoped_ptr<AppBaseWindow> base_window,
|
| + std::unique_ptr<AppBaseWindow> base_window,
|
| Profile* profile);
|
| ~AppWindowController() override;
|
|
|
| @@ -33,7 +33,7 @@ class AppWindowController : public WindowController {
|
| const Extension* extension) const override;
|
| base::DictionaryValue* CreateTabValue(const Extension* extension,
|
| int tab_index) const override;
|
| - scoped_ptr<api::tabs::Tab> CreateTabObject(
|
| + std::unique_ptr<api::tabs::Tab> CreateTabObject(
|
| const extensions::Extension* extension,
|
| int tab_index) const override;
|
|
|
| @@ -45,7 +45,7 @@ class AppWindowController : public WindowController {
|
|
|
| private:
|
| AppWindow* app_window_; // Owns us.
|
| - scoped_ptr<AppBaseWindow> base_window_;
|
| + std::unique_ptr<AppBaseWindow> base_window_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AppWindowController);
|
| };
|
|
|