content/browser/media/android/media_drm_credential_manager.h - Issue 1308823002: Move Singleton and related structs to namespace base

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/android/media_drm_credential_manager.h

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: ToT Created 5 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

Index: content/browser/media/android/media_drm_credential_manager.h

diff --git a/content/browser/media/android/media_drm_credential_manager.h b/content/browser/media/android/media_drm_credential_manager.h

index cf16cea9528f3edcfe53cdf747bea8668c86d6a0..56794e161694eb844ecb70e32b6c4195e9ec6c9d 100644

--- a/content/browser/media/android/media_drm_credential_manager.h

+++ b/content/browser/media/android/media_drm_credential_manager.h

@@ -35,8 +35,7 @@ class MediaDrmCredentialManager {

static bool RegisterMediaDrmCredentialManager(JNIEnv* env);

private:

- friend struct DefaultSingletonTraits<MediaDrmCredentialManager>;

- friend class Singleton<MediaDrmCredentialManager>;

+ friend struct base::DefaultSingletonTraits<MediaDrmCredentialManager>;

typedef media::MediaDrmBridge::SecurityLevel SecurityLevel;

MediaDrmCredentialManager();

« no previous file with comments | « content/browser/mach_broker_mac.mm ('k') | content/browser/media/android/media_drm_credential_manager.cc » ('j') | no next file with comments »