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

Unified Diff: chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc

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/component_toolbar_actions_factory.cc
diff --git a/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc b/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc
index c64eadfe5a408cf5786f5a503719af4e9e0ee3f4..487a59a88d9ba57f538fb13f71c930c0a21db8ee 100644
--- a/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc
+++ b/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc
@@ -47,7 +47,7 @@ std::set<std::string> ComponentToolbarActionsFactory::GetInitialComponentIds(
return component_ids;
}
-scoped_ptr<ToolbarActionViewController>
+std::unique_ptr<ToolbarActionViewController>
ComponentToolbarActionsFactory::GetComponentToolbarActionForId(
const std::string& id,
Browser* browser,
@@ -64,12 +64,12 @@ ComponentToolbarActionsFactory::GetComponentToolbarActionForId(
// e.g., RegisterChromeAction().
#if defined(ENABLE_MEDIA_ROUTER)
if (id == kMediaRouterActionId)
- return scoped_ptr<ToolbarActionViewController>(
+ return std::unique_ptr<ToolbarActionViewController>(
new MediaRouterAction(browser, bar));
#endif // defined(ENABLE_MEDIA_ROUTER)
NOTREACHED();
- return scoped_ptr<ToolbarActionViewController>();
+ return std::unique_ptr<ToolbarActionViewController>();
}
// static
« no previous file with comments | « chrome/browser/ui/toolbar/component_toolbar_actions_factory.h ('k') | chrome/browser/ui/toolbar/media_router_action.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698