components/dom_distiller/core/article_attachments_data.h - Issue 1879613003: Convert //components/dom_distiller 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/dom_distiller/core/article_attachments_data.h

Issue 1879613003: Convert //components/dom_distiller 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 | « components/dom_distiller/content/renderer/distiller_js_render_frame_observer.h ('k') | components/dom_distiller/core/article_attachments_data.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/dom_distiller/core/article_attachments_data.h

diff --git a/components/dom_distiller/core/article_attachments_data.h b/components/dom_distiller/core/article_attachments_data.h

index c25df29bf9a66d725388172dc5d36a50f4e3fd66..d5410c29700c6fd8171883ea45042dccda9b7450 100644

--- a/components/dom_distiller/core/article_attachments_data.h

+++ b/components/dom_distiller/core/article_attachments_data.h

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

#ifndef COMPONENTS_DOM_DISTILLER_CORE_ARTICLE_ATTACHMENTS_DATA_H_

#define COMPONENTS_DOM_DISTILLER_CORE_ARTICLE_ATTACHMENTS_DATA_H_

+#include <memory>

#include <string>

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

#include "components/dom_distiller/core/proto/distilled_article.pb.h"

#include "sync/api/attachments/attachment.h"

#include "sync/protocol/article_specifics.pb.h"

@@ -24,7 +24,7 @@ namespace dom_distiller {

// be rather opaque.

class ArticleAttachmentsData {

public:

- static scoped_ptr<ArticleAttachmentsData> GetFromAttachmentMap(

+ static std::unique_ptr<ArticleAttachmentsData> GetFromAttachmentMap(

const sync_pb::ArticleAttachments& attachments_key,

const syncer::AttachmentMap& attachment_map);