content/browser/wake_lock/wake_lock_service_context.h - Issue 1874893002: Convert //content/browser 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: content/browser/wake_lock/wake_lock_service_context.h

Issue 1874893002: Convert //content/browser 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 | « content/browser/vr/vr_device_manager_unittest.cc ('k') | content/browser/wake_lock/wake_lock_service_context_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/wake_lock/wake_lock_service_context.h

diff --git a/content/browser/wake_lock/wake_lock_service_context.h b/content/browser/wake_lock/wake_lock_service_context.h

index 73527dc28209e1598a2201fe47bd991868d879ec..f27461c17413f9de11e000b4079b0398e0516f04 100644

--- a/content/browser/wake_lock/wake_lock_service_context.h

+++ b/content/browser/wake_lock/wake_lock_service_context.h

@@ -5,11 +5,11 @@

#ifndef CONTENT_BROWSER_WAKE_LOCK_WAKE_LOCK_SERVICE_CONTEXT_H_

#define CONTENT_BROWSER_WAKE_LOCK_WAKE_LOCK_SERVICE_CONTEXT_H_

+#include <memory>

#include <set>

#include <utility>

#include "base/macros.h"

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

#include "base/memory/weak_ptr.h"

#include "content/browser/wake_lock/wake_lock_service_impl.h"

#include "content/common/content_export.h"

@@ -56,7 +56,7 @@ class CONTENT_EXPORT WakeLockServiceContext : public WebContentsObserver {

std::set<std::pair<int, int>> frames_requesting_lock_;

// The actual power save blocker for screen.

- scoped_ptr<PowerSaveBlocker> wake_lock_;

+ std::unique_ptr<PowerSaveBlocker> wake_lock_;

base::WeakPtrFactory<WakeLockServiceContext> weak_factory_;