Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(809)

Unified Diff: content/browser/media/cdm/browser_cdm_manager.cc

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
Index: content/browser/media/cdm/browser_cdm_manager.cc
diff --git a/content/browser/media/cdm/browser_cdm_manager.cc b/content/browser/media/cdm/browser_cdm_manager.cc
index f9fcb811e528793ff5670a8b5ead1745670b245f..1b78ba3c095c64e01b55f4ccb297918ea186bc22 100644
--- a/content/browser/media/cdm/browser_cdm_manager.cc
+++ b/content/browser/media/cdm/browser_cdm_manager.cc
@@ -365,8 +365,9 @@ void BrowserCdmManager::OnCreateSessionAndGenerateRequest(
#if defined(OS_ANDROID)
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableInfobarForProtectedMediaIdentifier)) {
- GenerateRequestIfPermitted(render_frame_id, cdm_id, eme_init_data_type,
- init_data, promise.Pass(), true);
+ GenerateRequestIfPermitted(
+ render_frame_id, cdm_id, eme_init_data_type,
+ init_data, promise.Pass(), PERMISSION_STATUS_GRANTED);
return;
}
#endif
@@ -532,9 +533,9 @@ void BrowserCdmManager::GenerateRequestIfPermitted(
media::EmeInitDataType init_data_type,
const std::vector<uint8>& init_data,
scoped_ptr<media::NewSessionCdmPromise> promise,
- bool permitted) {
+ PermissionStatus permission) {
cdm_cancel_permission_map_.erase(GetId(render_frame_id, cdm_id));
- if (!permitted) {
+ if (permission != PERMISSION_STATUS_GRANTED) {
promise->reject(MediaKeys::NOT_SUPPORTED_ERROR, 0, "Permission denied.");
return;
}

Powered by Google App Engine
This is Rietveld 408576698