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

Index: chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.cc

diff --git a/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.cc b/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.cc

index 7f18b9ed93d1a302d0a6febcadda7248880bae41..9dbab9f5369d1c9918268ac51a50c3a7ae768e4f 100644

--- a/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.cc

+++ b/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.cc

@@ -5,8 +5,7 @@

#include "chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.h"

#include <algorithm>

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

+#include <memory>

namespace options {

@@ -58,7 +57,7 @@ void PepperFlashContentSettingsUtils::FlashSiteSettingsToMediaExceptions(

MediaExceptions* media_exceptions) {

media_exceptions->clear();

- scoped_ptr<ContentSettingsPattern::BuilderInterface> builder(

+ std::unique_ptr<ContentSettingsPattern::BuilderInterface> builder(

ContentSettingsPattern::CreateBuilder(false));

builder->WithSchemeWildcard()->WithPortWildcard();

for (ppapi::FlashSiteSettings::const_iterator iter = site_settings.begin();