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

Unified Diff: chrome/browser/content_settings/permission_bubble_request_impl.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/content_settings/permission_bubble_request_impl.cc
diff --git a/chrome/browser/content_settings/permission_bubble_request_impl.cc b/chrome/browser/content_settings/permission_bubble_request_impl.cc
index 5359d6599f62fe2a6f13d91fcc760bd8ed3efcaa..5d7e6be70fbe2659a7d3ce04abf6043dde711852 100644
--- a/chrome/browser/content_settings/permission_bubble_request_impl.cc
+++ b/chrome/browser/content_settings/permission_bubble_request_impl.cc
@@ -51,6 +51,11 @@ int PermissionBubbleRequestImpl::GetIconID() const {
case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
icon_id = IDR_INFOBAR_WARNING;
break;
+#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
+ case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
+ icon_id = IDR_INFOBAR_PROTECTED_MEDIA_IDENTIFIER;
+ break;
+#endif
default:
NOTREACHED();
return IDR_INFOBAR_WARNING;
@@ -75,6 +80,11 @@ base::string16 PermissionBubbleRequestImpl::GetMessageText() const {
case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
message_id = IDS_PUSH_MESSAGES_PERMISSION_QUESTION;
break;
+#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
+ case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
+ message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_INFOBAR_QUESTION;
+ break;
+#endif
default:
NOTREACHED();
return base::string16();
@@ -104,6 +114,11 @@ base::string16 PermissionBubbleRequestImpl::GetMessageTextFragment() const {
case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
message_id = IDS_PUSH_MESSAGES_BUBBLE_FRAGMENT;
break;
+#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
+ case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
+ message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT;
+ break;
+#endif
default:
NOTREACHED();
return base::string16();
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/content_settings/permission_queue_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698