content/browser/media/capture/aura_window_capture_machine.cc - Issue 2075153002: Reland of '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/aura_window_capture_machine.cc

Issue 2075153002: Reland of 'Move content/browser/power_save_blocker to //device/power_save_blocker' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: missing libs for component mac 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.h ('k') | content/browser/media/capture/desktop_capture_device.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 529d09a88be55939bd9eadb14cb5171203e02a97..86f9524ceca131990ecef8d787bc8964bfd91f67 100644

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

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

@@ -14,8 +14,8 @@

#include "components/display_compositor/gl_helper.h"

#include "content/browser/compositor/image_transport_factory.h"

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

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

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

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

#include "media/base/video_capture_types.h"

#include "media/base/video_util.h"

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

@@ -87,8 +87,9 @@ bool AuraWindowCaptureMachine::InternalStart(

power_save_blocker_.reset(

CreatePowerSaveBlocker(

- PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,

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

+ device::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,

+ device::PowerSaveBlocker::kReasonOther,

+ "DesktopCaptureDevice is running")

.release());

return true;