Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2729)

Unified Diff: chrome/browser/ui/toolbar/toolbar_actions_model.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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_;
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.h ('k') | chrome/browser/ui/toolbar/toolbar_actions_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698