Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hide Widevine "ask for install" preference in brave://settings in favor of main toggle (uplift to 1.21.x) #7994

Merged
merged 1 commit into from
Feb 23, 2021
+1 −16
Merged

Hide Widevine "ask for install" preference in brave://settings in favor of main toggle (uplift to 1.21.x) #7994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions app/brave_generated_resources.grd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,15 +196,9 @@
<message name="IDS_WIDEVINE_DONT_ASK_AGAIN_CHECKBOX" desc="Checkbox for prevent showing widevine install prompt">
Don't ask again
</message>
<message name="IDS_SETTINGS_ENABLE_WIDEVINE_TITLE" desc="Text fragment for enabling widevine component. 'Widevine' is the name of a plugin and should not be translated.">
Enable Widevine
</message>
<message name="IDS_SETTINGS_ENABLE_WIDEVINE_DESC" desc="Text fragment for enabling widevine component. 'Widevine' is the name of a plugin and should not be translated.">
Use Widevine digital rights management (DRM) component to view protected streaming video and other content in the browser.
</message>
<message name="IDS_SETTINGS_ASK_WIDEVINE_INSTALL_DESC" desc="Text fragment for asking widevine install or not">
Ask when a site wants to install Widevine on your computer.
</message>
<message name="IDS_SETTINGS_ENABLE_TOR_TITLE" desc="Text fragment for enabling tor component">
Private window with Tor
</message>
Expand Down
8 changes: 1 addition & 7 deletions browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,17 +169,11 @@
sub-label="$i18n{webTorrentEnabledDesc}"
on-settings-boolean-control-change="onWebTorrentEnabledChange_">
</settings-toggle-button>
<settings-toggle-button
class="cr-row"
pref="{{prefs.brave.ask_widevine_install}}"
label="Widevine"
sub-label="$i18n{appearanceSettingsAskWidevineInstallDesc}">
</settings-toggle-button>
<settings-toggle-button
id="widevineEnabled"
class="cr-row"
pref=""
label="$i18n{widevineEnabledLabel}"
label="Widevine"
sub-label="$i18n{widevineEnabledDesc}"
on-settings-boolean-control-change="onWidevineEnabledChange_"
checked="[[widevineEnabled_]]">
Expand Down
3 changes: 0 additions & 3 deletions chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ void BraveAddCommonStrings(content::WebUIDataSource* html_source,
{"siteSettingsCategoryAutoplay", IDS_SETTINGS_SITE_SETTINGS_AUTOPLAY},
{"braveGetStartedTitle", IDS_SETTINGS_BRAVE_GET_STARTED_TITLE},
{"braveAdditionalSettingsTitle", IDS_SETTINGS_BRAVE_ADDITIONAL_SETTINGS},
{"appearanceSettingsAskWidevineInstallDesc",
IDS_SETTINGS_ASK_WIDEVINE_INSTALL_DESC},
{"appearanceSettingsBraveTheme",
IDS_SETTINGS_APPEARANCE_SETTINGS_BRAVE_THEMES},
{"appearanceSettingsLocationBarIsWide",
Expand Down Expand Up @@ -240,7 +238,6 @@ void BraveAddCommonStrings(content::WebUIDataSource* html_source,
{"torEnabledDesc", IDS_SETTINGS_ENABLE_TOR_DESC},
{"autoOnionLocationLabel", IDS_SETTINGS_AUTO_ONION_LOCATION_TITLE},
{"autoOnionLocationDesc", IDS_SETTINGS_AUTO_ONION_LOCATION_DESC},
{"widevineEnabledLabel", IDS_SETTINGS_ENABLE_WIDEVINE_TITLE},
{"widevineEnabledDesc", IDS_SETTINGS_ENABLE_WIDEVINE_DESC},
{"restartNotice", IDS_SETTINGS_RESTART_NOTICE},
{"relaunchButtonLabel", IDS_SETTINGS_RELAUNCH_BUTTON_LABEL},
Expand Down