Skip to content

Commit

Permalink
Merge pull request #12358 from brave/maxk-cr99-fup-fix-clear-browsing…
Browse files Browse the repository at this point in the history
…-data

[Cr99 follow up] Account for changes to WebUI JS code naming to reflect the Profile::IsChild API
  • Loading branch information
mkarolin committed Feb 23, 2022
1 parent c85e978 commit 163b426
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ Polymer({
*/
showUseSystem_(themeId, useSystemTheme) {
return (!!themeId || !useSystemTheme) &&
!this.appearanceBrowserProxy_.isSupervised();
!this.appearanceBrowserProxy_.isChildAccount();
},

/**
Expand Down Expand Up @@ -211,7 +211,7 @@ Polymer({
*/
showUseSystem_(themeId, useSystemTheme) {
return (!!themeId || !useSystemTheme) &&
!this.appearanceBrowserProxy_.isSupervised();
!this.appearanceBrowserProxy_.isChildAccount();
},

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
pref="{{prefs.browser.clear_data.browsing_history_on_exit}}"
label="$i18n{clearBrowsingHistory}"
sub-label="[[counters.browsing_history]]"
hidden="[[isSupervised_]]"
hidden="[[isChildAccount_]]"
no-set-pref>
</settings-checkbox>
<settings-checkbox id="downloadCheckboxOnExit"
pref="{{prefs.browser.clear_data.download_history_on_exit}}"
label="$i18n{clearDownloadHistory}"
sub-label="[[counters.download_history]]"
hidden="[[isSupervised_]]"
hidden="[[isChildAccount_]]"
no-set-pref>
</settings-checkbox>
<settings-checkbox id="cookiesCheckboxOnExit"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ Polymer({
value: false,
},

isSupervised_: {
isChildAccount_: {
type: Boolean,
value: function() {
return loadTimeData.getBoolean('isSupervised');
return loadTimeData.getBoolean('isChildAccount');
},
},

Expand Down

0 comments on commit 163b426

Please sign in to comment.