content/browser/renderer_host/media/media_stream_manager.cc - Issue 185863003: [Media] Add user gesture reporting for API calls to midi and media streams.

Unified Diff: content/browser/renderer_host/media/media_stream_manager.cc

Issue 185863003: [Media] Add user gesture reporting for API calls to midi and media streams. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: try 2 Created 6 years, 10 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/renderer_host/media/media_stream_manager.h ('k') | content/browser/renderer_host/media/media_stream_ui_proxy_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/media_stream_manager.cc

diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc

index 14c0d4dc4675bb96ae83d0b79c0eb23a82f6ca30..5444028a787a9ebec8e505082dac6bb22076a43f 100644

--- a/content/browser/renderer_host/media/media_stream_manager.cc

+++ b/content/browser/renderer_host/media/media_stream_manager.cc

@@ -166,6 +166,7 @@ class MediaStreamManager::DeviceRequest {

int requesting_view_id,

int page_request_id,

const GURL& security_origin,

+ bool user_gesture,

MediaStreamRequestType request_type,

const StreamOptions& options,

const ResourceContext::SaltCallback& salt_callback)

@@ -174,6 +175,7 @@ class MediaStreamManager::DeviceRequest {

requesting_view_id(requesting_view_id),

page_request_id(page_request_id),

security_origin(security_origin),

+ user_gesture(user_gesture),

request_type(request_type),

options(options),

salt_callback(salt_callback),

@@ -207,6 +209,7 @@ class MediaStreamManager::DeviceRequest {

requesting_view_id,

page_request_id,

security_origin,

+ user_gesture,

request_type,

requested_audio_device_id,

requested_video_device_id,

@@ -224,6 +227,7 @@ class MediaStreamManager::DeviceRequest {

target_render_view_id,

page_request_id,

security_origin,

+ user_gesture,

request_type,

"",

@@ -292,6 +296,8 @@ class MediaStreamManager::DeviceRequest {

const GURL security_origin;

+ const bool user_gesture;

const MediaStreamRequestType request_type;

const StreamOptions options;

@@ -382,6 +388,7 @@ std::string MediaStreamManager::MakeMediaAccessRequest(

render_view_id,

page_request_id,

security_origin,

+ false, // user gesture

tommi (sloooow) - chröme 2014/03/04 09:57:13 nit: only 2 spaces before // same below.

Greg Billock 2014/03/05 18:24:22 Done.

MEDIA_DEVICE_ACCESS,

options,

base::Bind(&ReturnEmptySalt));

@@ -407,7 +414,8 @@ void MediaStreamManager::GenerateStream(MediaStreamRequester* requester,

const ResourceContext::SaltCallback& sc,

int page_request_id,

const StreamOptions& options,

- const GURL& security_origin) {

+ const GURL& security_origin,

+ bool user_gesture) {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));

DVLOG(1) << "GenerateStream()";

if (CommandLine::ForCurrentProcess()->HasSwitch(

@@ -420,6 +428,7 @@ void MediaStreamManager::GenerateStream(MediaStreamRequester* requester,

render_view_id,

page_request_id,

security_origin,

+ user_gesture,

MEDIA_GENERATE_STREAM,

options,

sc);

@@ -612,6 +621,7 @@ std::string MediaStreamManager::EnumerateDevices(

render_view_id,

page_request_id,

security_origin,

+ false, // user gesture

MEDIA_ENUMERATE_DEVICES,

StreamOptions(),

sc);

@@ -691,6 +701,7 @@ void MediaStreamManager::OpenDevice(MediaStreamRequester* requester,

render_view_id,

page_request_id,

security_origin,

+ false, // user gesture

MEDIA_OPEN_DEVICE,

options,

sc);