content/browser/media/capture/desktop_capture_device.cc - Issue 2012853003: Reland of Pass SequencedTaskRunner to PowerSaveBlocker for ui/file ops

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 2012853003: Reland of Pass SequencedTaskRunner to PowerSaveBlocker for ui/file ops (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: SingleThreadTaskRunner for _x11 Created 4 years, 7 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 a76bc8d4fd9bad4cba6f3c32cd2f6c0a423ab122..9ef0dc1110914f2a67057628d93b107d6f3894f3 100644

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

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

@@ -22,7 +22,7 @@

#include "content/browser/media/capture/desktop_capture_device_uma_types.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/desktop_media_id.h"

-#include "content/public/browser/power_save_blocker.h"

+#include "content/public/browser/power_save_blocker_factory.h"

#include "media/base/video_util.h"

#include "media/capture/content/capture_resolution_chooser.h"

#include "third_party/libyuv/include/libyuv/scale_argb.h"

@@ -170,10 +170,10 @@ void DesktopCaptureDevice::Core::AllocateAndStart(

params.resolution_change_policy));

power_save_blocker_.reset(

- PowerSaveBlocker::Create(

+ CreatePowerSaveBlocker(

PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,

- PowerSaveBlocker::kReasonOther,

- "DesktopCaptureDevice is running").release());

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

+ .release());

desktop_capturer_->Start(this);