chrome/browser/ui/webui/site_settings_helper.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/webui/site_settings_helper.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/webui/signin/user_manager_screen_handler.cc ('k') | chrome/browser/ui/webui/site_settings_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/site_settings_helper.h

diff --git a/chrome/browser/ui/webui/site_settings_helper.h b/chrome/browser/ui/webui/site_settings_helper.h

index a42a04a524c8ad59c81f6fb026402ae3707c0184..34c300d91d096446590e5b4aac89f567bc9f4b7c 100644

--- a/chrome/browser/ui/webui/site_settings_helper.h

+++ b/chrome/browser/ui/webui/site_settings_helper.h

@@ -6,9 +6,9 @@

#define CHROME_BROWSER_UI_WEBUI_SITE_SETTINGS_HELPER_H_

#include <map>

+#include <memory>

#include <vector>

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

#include "components/content_settings/core/common/content_settings.h"

#include "components/content_settings/core/common/content_settings_pattern.h"

#include "components/content_settings/core/common/content_settings_types.h"

@@ -50,7 +50,7 @@ void GetExceptionsFromHostContentSettingsMap(

// for the content settings |type| mic or camera.

void GetPolicyAllowedUrls(

ContentSettingsType type,

- std::vector<scoped_ptr<base::DictionaryValue>>* exceptions,

+ std::vector<std::unique_ptr<base::DictionaryValue>>* exceptions,

content::WebUI* web_ui);

} // namespace site_settings

« no previous file with comments | « chrome/browser/ui/webui/signin/user_manager_screen_handler.cc ('k') | chrome/browser/ui/webui/site_settings_helper.cc » ('j') | no next file with comments »