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

Unified Diff: components/supervised_user_error_page/resources/supervised_user_block_interstitial.js

Issue 1890203002: Implement Web Restrictions in WebView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix final nits Created 4 years, 4 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: components/supervised_user_error_page/resources/supervised_user_block_interstitial.js
diff --git a/components/supervised_user_error_page/resources/supervised_user_block_interstitial.js b/components/supervised_user_error_page/resources/supervised_user_block_interstitial.js
index ca0bbec39b1d338a5bcf2b066d095658be9afc5a..8615994d926babe2c14681e47906acf49b61689c 100644
--- a/components/supervised_user_error_page/resources/supervised_user_block_interstitial.js
+++ b/components/supervised_user_error_page/resources/supervised_user_block_interstitial.js
@@ -15,7 +15,11 @@ function initialize() {
if (loadTimeData.getBoolean('allowAccessRequests')) {
$('request-access-button').onclick = function(event) {
$('request-access-button').hidden = true;
- sendCommand('request');
+ if (window.domAutomationController) {
+ sendCommand('request');
+ } else {
+ window.webRestrictions.requestPermission(setRequestStatus);
+ }
};
} else {
$('request-access-button').hidden = true;
@@ -48,7 +52,7 @@ function initialize() {
}
var showDetailsLink = loadTimeData.getString('showDetailsLink');
$('show-details-link').hidden = !showDetailsLink;
- $('back-button').hidden = showDetailsLink;
+ $('back-button').hidden = showDetailsLink || !window.domAutomationController;
$('back-button').onclick = function(event) {
sendCommand('back');
};
@@ -66,7 +70,8 @@ function initialize() {
$('information-container').classList.remove('hidden-on-mobile');
$('request-access-button').classList.remove('hidden-on-mobile');
};
- if (loadTimeData.getBoolean('showFeedbackLink')) {
+ if (window.domAutomationController &&
+ loadTimeData.getBoolean('showFeedbackLink')) {
$('feedback-link').onclick = function(event) {
sendCommand('feedback');
};
@@ -80,6 +85,7 @@ function initialize() {
* @param {boolean} isSuccessful Whether the request was successful or not.
*/
function setRequestStatus(isSuccessful) {
+ console.log('setRequestStatus(' + isSuccessful +')');
$('block-page-message').hidden = true;
if (isSuccessful) {
$('request-failed-message').hidden = true;
@@ -87,7 +93,7 @@ function setRequestStatus(isSuccessful) {
$('show-details-link').hidden = true;
$('hide-details-link').hidden = true;
$('details').hidden = true;
- $('back-button').hidden = false;
+ $('back-button').hidden = !window.domAutomationController;
$('request-access-button').hidden = true;
} else {
$('request-failed-message').hidden = false;

Powered by Google App Engine
This is Rietveld 408576698