content/browser/media/cdm/browser_cdm_manager.h - Issue 955383003: ContentBrowserClient::RequestPermission replies with PermissionStatus instead of bool.

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/cdm/browser_cdm_manager.h

Issue 955383003: ContentBrowserClient::RequestPermission replies with PermissionStatus instead of bool. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix android geolocation breakage Created 5 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

« chrome/browser/content_settings/permission_context_base.cc ('K') | « chrome/browser/services/gcm/push_messaging_service_impl.cc ('k') | content/browser/media/cdm/browser_cdm_manager.cc » ('j') | content/public/browser/content_browser_client.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/cdm/browser_cdm_manager.h

diff --git a/content/browser/media/cdm/browser_cdm_manager.h b/content/browser/media/cdm/browser_cdm_manager.h

index 973ecff1c1124196e837ababe66a9dd2ada29185..12ee61702b435e4400ae9644690657aaf5dea2a2 100644

--- a/content/browser/media/cdm/browser_cdm_manager.h

+++ b/content/browser/media/cdm/browser_cdm_manager.h

@@ -17,6 +17,7 @@

#include "content/common/content_export.h"

#include "content/common/media/cdm_messages_enums.h"

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

+#include "content/public/common/permission_status.mojom.h"

#include "ipc/ipc_message.h"

#include "media/base/cdm_promise.h"

#include "media/base/eme_constants.h"

@@ -163,7 +164,7 @@ class CONTENT_EXPORT BrowserCdmManager : public BrowserMessageFilter {

media::EmeInitDataType init_data_type,

const std::vector<uint8>& init_data,

scoped_ptr<media::NewSessionCdmPromise> promise,

- bool permitted);

+ PermissionStatus permission);

const int render_process_id_;