Index: chrome/browser/chrome_content_browser_client.cc |
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc |
index 68ec9e0040d15a85df8a27d7e10e6906e71db5cd..cf63aa7cf1ec233a8427de64bbba0c5e8ce9d4c0 100644 |
--- a/chrome/browser/chrome_content_browser_client.cc |
+++ b/chrome/browser/chrome_content_browser_client.cc |
@@ -39,7 +39,6 @@ |
#include "chrome/browser/media/media_capture_devices_dispatcher.h" |
#include "chrome/browser/media/midi_permission_context.h" |
#include "chrome/browser/media/midi_permission_context_factory.h" |
-#include "chrome/browser/media/protected_media_identifier_permission_context_factory.h" |
#include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" |
#include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" |
#include "chrome/browser/net/chrome_net_log.h" |
@@ -159,14 +158,17 @@ |
#include "chrome/browser/android/new_tab_page_url_handler.h" |
#include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h" |
#include "chrome/browser/chrome_browser_main_android.h" |
-#include "chrome/browser/media/protected_media_identifier_permission_context.h" |
-#include "chrome/browser/media/protected_media_identifier_permission_context_factory.h" |
#include "chrome/common/descriptors_android.h" |
#include "components/crash/browser/crash_dump_manager_android.h" |
#elif defined(OS_POSIX) |
#include "chrome/browser/chrome_browser_main_posix.h" |
#endif |
+#if defined(OS_ANDROID) || defined(OS_CHROMEOS) |
+#include "chrome/browser/media/protected_media_identifier_permission_context.h" |
+#include "chrome/browser/media/protected_media_identifier_permission_context_factory.h" |
+#endif |
+ |
#if defined(OS_POSIX) && !defined(OS_MACOSX) |
#include "base/debug/leak_annotations.h" |
#include "components/crash/app/breakpad_linux.h" |
@@ -634,7 +636,7 @@ PermissionContextBase* GetPermissionContext(Profile* profile, |
case content::PERMISSION_GEOLOCATION: |
return GeolocationPermissionContextFactory::GetForProfile(profile); |
case content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER: |
-#if defined(OS_ANDROID) |
+#if defined(OS_ANDROID) || defined(OS_CHROMEOS) |
return ProtectedMediaIdentifierPermissionContextFactory::GetForProfile( |
profile); |
#else |
@@ -1944,7 +1946,7 @@ void ChromeContentBrowserClient::RequestPermission( |
result_callback); |
break; |
case content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER: |
-#if defined(OS_ANDROID) |
+#if defined(OS_ANDROID) || defined(OS_CHROMEOS) |
ProtectedMediaIdentifierPermissionContextFactory::GetForProfile(profile) |
->RequestPermission(web_contents, |
request_id, |
@@ -2034,7 +2036,7 @@ void ChromeContentBrowserClient::CancelPermissionRequest( |
->CancelPermissionRequest(web_contents, request_id); |
break; |
case content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER: |
-#if defined(OS_ANDROID) |
+#if defined(OS_ANDROID) || defined(OS_CHROMEOS) |
ProtectedMediaIdentifierPermissionContextFactory::GetForProfile(profile) |
->CancelPermissionRequest(web_contents, request_id); |
#else |