chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc - Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/toolbar/mock_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

« no previous file with comments | « chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h ('k') | chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc

diff --git a/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc b/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc

index f449733952e99f0b62d5ef7659f5e4c458824de4..f4e75a92de03938737b29b734c5563df7f11b96f 100644

--- a/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc

+++ b/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc

@@ -35,13 +35,13 @@ MockComponentToolbarActionsFactory::GetInitialComponentIds(Profile* profile) {

return ids;

}

-scoped_ptr<ToolbarActionViewController>

+std::unique_ptr<ToolbarActionViewController>

MockComponentToolbarActionsFactory::GetComponentToolbarActionForId(

const std::string& id,

Browser* browser,

ToolbarActionsBar* bar) {

DCHECK_EQ(kActionIdForTesting, id);

- return scoped_ptr<ToolbarActionViewController>(

+ return std::unique_ptr<ToolbarActionViewController>(

new TestToolbarActionViewController(

MockComponentToolbarActionsFactory::kActionIdForTesting));

}