chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc - Issue 863263007: media: Enable ProtectedMediaIdentifierPermissionContext on ChromeOS.

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: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

Issue 863263007: media: Enable ProtectedMediaIdentifierPermissionContext on ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase only Created 5 years, 11 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: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

index b10528d8ee31ae87b1056a405eda30442374156a..9d8faee79d92354ce7b6ab0a81a53dd75503ae0d 100644

--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

@@ -104,9 +104,11 @@

#include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h"

#endif

-#if defined(OS_ANDROID)

+#if defined(OS_ANDROID) || defined(OS_CHROMEOS)

#include "chrome/browser/media/protected_media_identifier_permission_context_factory.h"

-#else

+#endif

+#if !defined(OS_ANDROID)

#include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h"

#endif

@@ -173,7 +175,7 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {

CaptivePortalServiceFactory::GetInstance();

#endif

GeolocationPermissionContextFactory::GetInstance();

-#if defined(OS_ANDROID)

+#if defined(OS_ANDROID) || defined(OS_CHROMEOS)

ProtectedMediaIdentifierPermissionContextFactory::GetInstance();

#endif

#if defined(ENABLE_PRINT_PREVIEW)

« no previous file with comments | « chrome/browser/media/protected_media_identifier_permission_context_factory.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »