components/favicon/core/favicon_driver_impl.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/core/favicon_driver_impl.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/content/content_favicon_driver_unittest.cc ('k') | components/favicon/core/favicon_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/favicon/core/favicon_driver_impl.h

diff --git a/components/favicon/core/favicon_driver_impl.h b/components/favicon/core/favicon_driver_impl.h

index d3cd66048633f6acd87a79e2a209b9a25ae51368..f6238490910dc0243720903117cc28dc1ef75035 100644

--- a/components/favicon/core/favicon_driver_impl.h

+++ b/components/favicon/core/favicon_driver_impl.h

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

#ifndef COMPONENTS_FAVICON_CORE_FAVICON_DRIVER_IMPL_H_

#define COMPONENTS_FAVICON_CORE_FAVICON_DRIVER_IMPL_H_

+#include <memory>

#include <vector>

#include "base/macros.h"

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

#include "components/favicon/core/favicon_driver.h"

class GURL;

@@ -88,8 +88,8 @@ class FaviconDriverImpl : public FaviconDriver {

// FaviconHandlers used to download the different kind of favicons.

// |touch_icon_handler_| may be null depending on the platform and variations.

- scoped_ptr<FaviconHandler> favicon_handler_;

- scoped_ptr<FaviconHandler> touch_icon_handler_;

+ std::unique_ptr<FaviconHandler> favicon_handler_;

+ std::unique_ptr<FaviconHandler> touch_icon_handler_;

DISALLOW_COPY_AND_ASSIGN(FaviconDriverImpl);

};