chrome/browser/ui/toolbar/component_toolbar_actions_factory.h - 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/component_toolbar_actions_factory.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

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

Index: chrome/browser/ui/toolbar/component_toolbar_actions_factory.h

diff --git a/chrome/browser/ui/toolbar/component_toolbar_actions_factory.h b/chrome/browser/ui/toolbar/component_toolbar_actions_factory.h

index a96bd3fb20a1685fe5484b2faa8145761557dd24..3f00ca9c1d0f53b37bf12b5b59da8bfb5deabfdb 100644

--- a/chrome/browser/ui/toolbar/component_toolbar_actions_factory.h

+++ b/chrome/browser/ui/toolbar/component_toolbar_actions_factory.h

@@ -5,11 +5,11 @@

#ifndef CHROME_BROWSER_UI_TOOLBAR_COMPONENT_TOOLBAR_ACTIONS_FACTORY_H_

#define CHROME_BROWSER_UI_TOOLBAR_COMPONENT_TOOLBAR_ACTIONS_FACTORY_H_

+#include <memory>

#include <set>

#include <string>

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

#include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"

class Browser;

@@ -38,8 +38,9 @@ class ComponentToolbarActionsFactory {

// Returns a collection of controllers for component actions. Declared

// virtual for testing.

- virtual scoped_ptr<ToolbarActionViewController>

- GetComponentToolbarActionForId(const std::string& id, Browser* browser,

+ virtual std::unique_ptr<ToolbarActionViewController>

+ GetComponentToolbarActionForId(const std::string& id,

+ Browser* browser,

ToolbarActionsBar* bar);

// Registers component actions that are migrating from extensions.