components/favicon_base/favicon_types.h - Issue 1918083002: Convert //components/[f-n]* 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: components/favicon_base/favicon_types.h

Issue 1918083002: Convert //components/[f-n]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: … 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 | « components/favicon_base/fallback_icon_url_parser_unittest.cc ('k') | components/favicon_base/favicon_url_parser_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/favicon_base/favicon_types.h

diff --git a/components/favicon_base/favicon_types.h b/components/favicon_base/favicon_types.h

index 068fd17e61dca5aa6af9f9f4e3b4ba301dd4331f..6a399cefe0ebb4e03e6000ea79e6480a60862805 100644

--- a/components/favicon_base/favicon_types.h

+++ b/components/favicon_base/favicon_types.h

@@ -7,8 +7,9 @@

#include <stdint.h>

+#include <memory>

#include "base/memory/ref_counted_memory.h"

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

#include "ui/gfx/geometry/size.h"

#include "ui/gfx/image/image.h"

#include "url/gurl.h"

@@ -95,7 +96,7 @@ struct LargeIconResult {

// The fallback icon style if a sufficiently large icon isn't available. This

// uses the dominant color of a smaller icon as the background if available.

- scoped_ptr<FallbackIconStyle> fallback_icon_style;

+ std::unique_ptr<FallbackIconStyle> fallback_icon_style;

};

} // namespace favicon_base