content/browser/media/capture/desktop_capture_device.cc - Issue 2073353002: Merge PowerSaveBlockerImpl and PowerSaveBlocker

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/media/capture/desktop_capture_device.cc

Issue 2073353002: Merge PowerSaveBlockerImpl and PowerSaveBlocker (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove-power-factory

Patch Set: android Created 4 years, 6 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/media/capture/aura_window_capture_machine.cc ('k') | content/browser/media/media_web_contents_observer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/capture/desktop_capture_device.cc

diff --git a/content/browser/media/capture/desktop_capture_device.cc b/content/browser/media/capture/desktop_capture_device.cc

index f3750d1ff317fe0b1803f6aabde5e0f0184cd4fa..284b8806e1a4499a9d35e45a39552431bfe30a0f 100644

--- a/content/browser/media/capture/desktop_capture_device.cc

+++ b/content/browser/media/capture/desktop_capture_device.cc

@@ -172,14 +172,11 @@ void DesktopCaptureDevice::Core::AllocateAndStart(

params.requested_format.frame_size,

params.resolution_change_policy));

- power_save_blocker_.reset(

- device::PowerSaveBlocker::CreateWithTaskRunners(

- device::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,

- device::PowerSaveBlocker::kReasonOther,

- "DesktopCaptureDevice is running",

- BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),

- BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE))

- .release());

+ power_save_blocker_.reset(new device::PowerSaveBlocker(

+ device::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,

+ device::PowerSaveBlocker::kReasonOther, "DesktopCaptureDevice is running",

+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),

+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)));

desktop_capturer_->Start(this);