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

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

Issue 1373883003: Move geolocation and permission mojoms into components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 7294ef40c4d78752c14987e4b71c9edc56024b3f..ed35860868f84291bfadc184ea7ea0ecaa63dd3c 100644
--- a/content/browser/media/cdm/browser_cdm_manager.cc
+++ b/content/browser/media/cdm/browser_cdm_manager.cc
@@ -625,11 +625,12 @@ void BrowserCdmManager::CheckPermissionStatusOnUIThread(
return;
}
- PermissionStatus permission_status = permission_manager->GetPermissionStatus(
- PermissionType::PROTECTED_MEDIA_IDENTIFIER, security_origin,
- web_contents->GetLastCommittedURL().GetOrigin());
+ permission::Status permission_status =
+ permission_manager->GetPermissionStatus(
+ PermissionType::PROTECTED_MEDIA_IDENTIFIER, security_origin,
+ web_contents->GetLastCommittedURL().GetOrigin());
- bool allowed = (permission_status == PERMISSION_STATUS_GRANTED);
+ bool allowed = (permission_status == permission::STATUS_GRANTED);
if (!task_runner_->RunsTasksOnCurrentThread()) {
task_runner_->PostTask(FROM_HERE,
base::Bind(permission_status_cb, allowed));
« no previous file with comments | « content/browser/media/cdm/browser_cdm_manager.h ('k') | content/browser/permissions/permission_service_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698