content/browser/media/cdm/browser_cdm_manager.h - Issue 571483002: Refactor content client to include a single Request/CancelPermission method.

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 571483002: Refactor content client to include a single Request/CancelPermission method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@geoloc_permission

Patch Set: Created 6 years, 3 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/geolocation/geolocation_dispatcher_host.cc ('k') | content/browser/media/cdm/browser_cdm_manager.cc » ('j') | no next file with comments »
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 85be4c182a59b9297562f7cd49d22e732ea5a77f..99a181b16e9664c61a7e7c9ee3f8d03569a74c3f 100644

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

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

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

#define CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_

#include <map>

+#include <set>

#include <string>

#include <vector>

@@ -115,7 +116,7 @@ class CONTENT_EXPORT BrowserCdmManager {

std::map<int, GURL> cdm_security_origin_map_;

// Map from CDM ID to a callback to cancel the permission request.

- std::map<int, base::Closure> cdm_cancel_permision_map_;

+ std::set<int> cdm_cancel_permision_set_;

// NOTE: Weak pointers must be invalidated before all other member variables.

base::WeakPtrFactory<BrowserCdmManager> weak_ptr_factory_;

« no previous file with comments | « content/browser/geolocation/geolocation_dispatcher_host.cc ('k') | content/browser/media/cdm/browser_cdm_manager.cc » ('j') | no next file with comments »