components/resource_provider/public/cpp/resource_loader.h - Issue 1921923002: Convert //components/[o-t]* 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/resource_provider/public/cpp/resource_loader.h

Issue 1921923002: Convert //components/[o-t]* 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/renderer_context_menu/views/toolkit_delegate_views.h ('k') | components/resource_provider/public/cpp/resource_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/resource_provider/public/cpp/resource_loader.h

diff --git a/components/resource_provider/public/cpp/resource_loader.h b/components/resource_provider/public/cpp/resource_loader.h

index 533ec21bb0ea88e2c78a067921f97f4f7b56dd25..9153b47bc08605a05373ce60bd979adcdbb4b9d3 100644

--- a/components/resource_provider/public/cpp/resource_loader.h

+++ b/components/resource_provider/public/cpp/resource_loader.h

@@ -6,12 +6,12 @@

#define COMPONENTS_RESOURCE_PROVIDER_PUBLIC_CPP_RESOURCE_LOADER_H_

#include <map>

+#include <memory>

#include <set>

#include <string>

#include <vector>

#include "base/macros.h"

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

#include "components/resource_provider/public/interfaces/resource_provider.mojom.h"

#include "mojo/platform_handle/platform_handle.h"

#include "mojo/public/cpp/bindings/array.h"

@@ -49,7 +49,7 @@ class ResourceLoader {

bool loaded() const { return loaded_; }

private:

- using ResourceMap = std::map<std::string, scoped_ptr<base::File>>;

+ using ResourceMap = std::map<std::string, std::unique_ptr<base::File>>;

// Callback when resources have loaded.

void OnGotResources(const std::vector<std::string>& paths,