Commit 810e38a0 authored by Igor's avatar Igor Committed by Commit Bot

Remove non-app-window URLs from feedback page

Currently three links from feedback form don't work properly on login
screen, by opening invisible incognito windows only. This CL removes
the links until the problem can be fixed on login screen.

screen and click on the links for privacy/terms of service. Nothing is
expected to happen, the links are disabled.

Bug: chromium:1116383
TEST: Manually verified on device by pressing alt+shift+I on login
Change-Id: Ieffd4cccbc8fbac52f45890761783cadb29cd3ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2362797
Commit-Queue: Igor <igorcov@chromium.org>
Reviewed-by: default avatarIgor <igorcov@chromium.org>
Reviewed-by: default avatarAhmed Fakhry <afakhry@chromium.org>
Reviewed-by: default avatarRoland Bock <rbock@google.com>
Auto-Submit: Igor <igorcov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800531}
parent a64b102d
...@@ -512,67 +512,71 @@ function initialize() { ...@@ -512,67 +512,71 @@ function initialize() {
true /* useAppWindow */); true /* useAppWindow */);
} }
const legalHelpPageUrlElement = $('legal-help-page-url'); // The following URLs don't open on login screen, so hide them.
if (legalHelpPageUrlElement) { // TODO(crbug.com/1116383): Find a solution to display them properly.
setupLinkHandlers( if (feedbackInfo.flow != chrome.feedbackPrivate.FeedbackFlow.LOGIN) {
legalHelpPageUrlElement, FEEDBACK_LEGAL_HELP_URL, const legalHelpPageUrlElement = $('legal-help-page-url');
false /* useAppWindow */); if (legalHelpPageUrlElement) {
} setupLinkHandlers(
legalHelpPageUrlElement, FEEDBACK_LEGAL_HELP_URL,
const privacyPolicyUrlElement = $('privacy-policy-url'); false /* useAppWindow */);
if (privacyPolicyUrlElement) { }
setupLinkHandlers(
privacyPolicyUrlElement, FEEDBACK_PRIVACY_POLICY_URL, const privacyPolicyUrlElement = $('privacy-policy-url');
false /* useAppWindow */); if (privacyPolicyUrlElement) {
} setupLinkHandlers(
privacyPolicyUrlElement, FEEDBACK_PRIVACY_POLICY_URL,
const termsOfServiceUrlElement = $('terms-of-service-url'); false /* useAppWindow */);
if (termsOfServiceUrlElement) { }
setupLinkHandlers(
termsOfServiceUrlElement, FEEDBACK_TERM_OF_SERVICE_URL, const termsOfServiceUrlElement = $('terms-of-service-url');
false /* useAppWindow */); if (termsOfServiceUrlElement) {
} setupLinkHandlers(
termsOfServiceUrlElement, FEEDBACK_TERM_OF_SERVICE_URL,
const bluetoothLogsInfoLinkElement = $('bluetooth-logs-info-link'); false /* useAppWindow */);
if (bluetoothLogsInfoLinkElement) { }
bluetoothLogsInfoLinkElement.onclick = function(e) {
e.preventDefault(); const bluetoothLogsInfoLinkElement = $('bluetooth-logs-info-link');
if (bluetoothLogsInfoLinkElement) {
chrome.app.window.create( bluetoothLogsInfoLinkElement.onclick = function(e) {
'/html/bluetooth_logs_info.html',
{width: 400, height: 120, resizable: false},
function(appWindow) {
appWindow.contentWindow.onload = function() {
i18nTemplate.process(
appWindow.contentWindow.document, loadTimeData);
};
});
bluetoothLogsInfoLinkElement.onauxclick = function(e) {
e.preventDefault(); e.preventDefault();
};
};
}
const assistantLogsInfoLinkElement = $('assistant-logs-info-link');
if (assistantLogsInfoLinkElement) {
assistantLogsInfoLinkElement.onclick = function(e) {
e.preventDefault();
chrome.app.window.create( chrome.app.window.create(
'/html/assistant_logs_info.html', '/html/bluetooth_logs_info.html',
{width: 400, height: 120, resizable: false, frame: 'none'}, {width: 400, height: 120, resizable: false},
function(appWindow) { function(appWindow) {
appWindow.contentWindow.onload = function() { appWindow.contentWindow.onload = function() {
i18nTemplate.process( i18nTemplate.process(
appWindow.contentWindow.document, loadTimeData); appWindow.contentWindow.document, loadTimeData);
}; };
}); });
bluetoothLogsInfoLinkElement.onauxclick = function(e) {
e.preventDefault();
};
};
}
assistantLogsInfoLinkElement.onauxclick = function(e) { const assistantLogsInfoLinkElement = $('assistant-logs-info-link');
if (assistantLogsInfoLinkElement) {
assistantLogsInfoLinkElement.onclick = function(e) {
e.preventDefault(); e.preventDefault();
chrome.app.window.create(
'/html/assistant_logs_info.html',
{width: 400, height: 120, resizable: false, frame: 'none'},
function(appWindow) {
appWindow.contentWindow.onload = function() {
i18nTemplate.process(
appWindow.contentWindow.document, loadTimeData);
};
});
assistantLogsInfoLinkElement.onauxclick = function(e) {
e.preventDefault();
};
}; };
}; }
} }
// Make sure our focus starts on the description field. // Make sure our focus starts on the description field.
......
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