extensions/browser/api/webcam_private/webcam_private_api.h - Issue 1902873002: Convert //extensions/browser/api 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: extensions/browser/api/webcam_private/webcam_private_api.h

Issue 1902873002: Convert //extensions/browser/api 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 | « extensions/browser/api/webcam_private/visca_webcam_unittest.cc ('k') | extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/api/webcam_private/webcam_private_api.h

diff --git a/extensions/browser/api/webcam_private/webcam_private_api.h b/extensions/browser/api/webcam_private/webcam_private_api.h

index 04efcd2eec5d2d561e0e5a4dc99da1d8e6150f78..68752b5d403e5c0bae33f9f5ced5333b2ca15b40 100644

--- a/extensions/browser/api/webcam_private/webcam_private_api.h

+++ b/extensions/browser/api/webcam_private/webcam_private_api.h

@@ -6,9 +6,9 @@

#define EXTENSIONS_BROWSER_API_WEBCAM_PRIVATE_WEBCAM_PRIVATE_API_H_

#include <map>

+#include <memory>

#include "base/macros.h"

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

#include "base/scoped_observer.h"

#include "extensions/browser/api/api_resource_manager.h"

#include "extensions/browser/api/webcam_private/webcam.h"

@@ -73,7 +73,7 @@ class WebcamPrivateAPI : public BrowserContextKeyedAPI {

static const bool kServiceRedirectedInIncognito = true;

content::BrowserContext* const browser_context_;

- scoped_ptr<ApiResourceManager<WebcamResource>> webcam_resource_manager_;

+ std::unique_ptr<ApiResourceManager<WebcamResource>> webcam_resource_manager_;

base::WeakPtrFactory<WebcamPrivateAPI> weak_ptr_factory_;