content/browser/media/capture/desktop_capture_device.cc - Issue 1999953002: Move content/browser/power_save_blocker to //device/power_save_blocker

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 1999953002: Move content/browser/power_save_blocker to //device/power_save_blocker (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@power-save-next-2

Patch Set: . 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.h » ('j') | content/public/browser/DEPS » ('J')
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 415096a0abc6b9d0a733a3390317de2625c49f8e..0b95b2b29aa21c4113e3a495854a8938369e27a7 100644

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

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

@@ -133,7 +133,7 @@ class DesktopCaptureDevice::Core : public webrtc::DesktopCapturer::Callback {

// TODO(jiayl): Remove power_save_blocker_ when there is an API to keep the

// screen from sleeping for the drive-by web.

- std::unique_ptr<PowerSaveBlocker> power_save_blocker_;

+ std::unique_ptr<device::PowerSaveBlocker> power_save_blocker_;

DISALLOW_COPY_AND_ASSIGN(Core);

};

@@ -174,8 +174,9 @@ void DesktopCaptureDevice::Core::AllocateAndStart(

power_save_blocker_.reset(

CreatePowerSaveBlocker(

- PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,

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

+ device::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,

+ device::PowerSaveBlocker::kReasonOther,

+ "DesktopCaptureDevice is running")

.release());

desktop_capturer_->Start(this);