chrome/browser/extensions/scripting_permissions_modifier.h - Issue 1871713002: Convert //chrome/browser/extensions 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/extensions/scripting_permissions_modifier.h

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase and fix header 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/extensions/requirements_checker_browsertest.cc ('k') | chrome/browser/extensions/scripting_permissions_modifier.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/scripting_permissions_modifier.h

diff --git a/chrome/browser/extensions/scripting_permissions_modifier.h b/chrome/browser/extensions/scripting_permissions_modifier.h

index 1b4a5680c229e50a195abe95049ff7b71a1a4d10..5cc5b1fe38ce44c2998a604931c413632f47ff82 100644

--- a/chrome/browser/extensions/scripting_permissions_modifier.h

+++ b/chrome/browser/extensions/scripting_permissions_modifier.h

@@ -5,9 +5,10 @@

#ifndef CHROME_BROWSER_EXTENSIONS_SCRIPTING_PERMISSIONS_MODIFIER_H_

#define CHROME_BROWSER_EXTENSIONS_SCRIPTING_PERMISSIONS_MODIFIER_H_

+#include <memory>

#include "base/macros.h"

#include "base/memory/ref_counted.h"

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

class GURL;

@@ -57,8 +58,8 @@ class ScriptingPermissionsModifier {

// was just installed, not taking into account extra granted preferences.

void WithholdPermissions(

const PermissionSet& permissions,

- scoped_ptr<const PermissionSet>* granted_permissions_out,

- scoped_ptr<const PermissionSet>* withheld_permissions_out,

+ std::unique_ptr<const PermissionSet>* granted_permissions_out,

+ std::unique_ptr<const PermissionSet>* withheld_permissions_out,

bool use_initial_state) const;

// Grants any withheld all-hosts (or all-hosts-like) permissions.