| Index: chrome/browser/ui/toolbar/toolbar_actions_model.h
|
| diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model.h b/chrome/browser/ui/toolbar/toolbar_actions_model.h
|
| index f43f56640e29e0b3e67633b649c4b97f192182e7..71c5f1ebed37389ecb89e11fec0dd0e5419eaa9a 100644
|
| --- a/chrome/browser/ui/toolbar/toolbar_actions_model.h
|
| +++ b/chrome/browser/ui/toolbar/toolbar_actions_model.h
|
| @@ -156,7 +156,7 @@ class ToolbarActionsModel
|
| ScopedVector<ToolbarActionViewController> CreateActions(
|
| Browser* browser,
|
| ToolbarActionsBar* bar);
|
| - scoped_ptr<ToolbarActionViewController> CreateActionForItem(
|
| + std::unique_ptr<ToolbarActionViewController> CreateActionForItem(
|
| Browser* browser,
|
| ToolbarActionsBar* bar,
|
| const ToolbarItem& item);
|
| @@ -285,7 +285,8 @@ class ToolbarActionsModel
|
| extensions::ExtensionActionManager* extension_action_manager_;
|
|
|
| // The ComponentMigrationHelper.
|
| - scoped_ptr<extensions::ComponentMigrationHelper> component_migration_helper_;
|
| + std::unique_ptr<extensions::ComponentMigrationHelper>
|
| + component_migration_helper_;
|
|
|
| // True if we've handled the initial EXTENSIONS_READY notification.
|
| bool actions_initialized_;
|
|
|