Commit 4640343f authored by Xiaohan Wang's avatar Xiaohan Wang Committed by Commit Bot

media: Add "Protected content" to PageInfo on Android

When the "Protected content" permission decision is different from the
default value, "Protected content" will show up in the PageInfo.

See screenshots at:
https://photos.app.goo.gl/Rmd5S75gTUNU7vZVA

Similar change on ChromeOS will be done in a separate CL.

Bug: 593210
Test: Manually tested. See screenshots linked above.
Change-Id: I87e7cda9b4e46b70e0410ec213b49590c8f5cd74
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1898611Reviewed-by: default avatarBalazs Engedy <engedy@chromium.org>
Reviewed-by: default avatarYaron Friedman <yfriedman@chromium.org>
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713131}
parent fb3431ea
...@@ -122,6 +122,8 @@ void PageInfoControllerAndroid::SetPermissionInfo( ...@@ -122,6 +122,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
permissions_to_display.push_back(ContentSettingsType::JAVASCRIPT); permissions_to_display.push_back(ContentSettingsType::JAVASCRIPT);
permissions_to_display.push_back(ContentSettingsType::POPUPS); permissions_to_display.push_back(ContentSettingsType::POPUPS);
permissions_to_display.push_back(ContentSettingsType::ADS); permissions_to_display.push_back(ContentSettingsType::ADS);
permissions_to_display.push_back(
ContentSettingsType::PROTECTED_MEDIA_IDENTIFIER);
permissions_to_display.push_back(ContentSettingsType::AUTOPLAY); permissions_to_display.push_back(ContentSettingsType::AUTOPLAY);
permissions_to_display.push_back(ContentSettingsType::SOUND); permissions_to_display.push_back(ContentSettingsType::SOUND);
base::CommandLine* cmd = base::CommandLine::ForCurrentProcess(); base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment