diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/chrome/browser/resources/feedback | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/browser/resources/feedback')
| -rw-r--r-- | chromium/chrome/browser/resources/feedback/html/default.html | 29 | ||||
| -rw-r--r-- | chromium/chrome/browser/resources/feedback/js/event_handler.js | 15 |
2 files changed, 23 insertions, 21 deletions
diff --git a/chromium/chrome/browser/resources/feedback/html/default.html b/chromium/chrome/browser/resources/feedback/html/default.html index b7c50d54717..2cfa06d8d1a 100644 --- a/chromium/chrome/browser/resources/feedback/html/default.html +++ b/chromium/chrome/browser/resources/feedback/html/default.html @@ -1,24 +1,25 @@ <!doctype html> <html i18n-values="dir:textdirection;lang:language"> <head> -<meta charset="utf-8"> -<link rel="stylesheet" href="chrome://resources/css/text_defaults.css"> -<link rel="stylesheet" href="chrome://resources/css/apps/common.css"></link> -<link rel="stylesheet" href="chrome://resources/css/apps/topbutton_bar.css"> -</link> -<link rel="stylesheet" href="../css/feedback.css"> + <title i18n-content="appTitle"> </title> + <meta charset="utf-8"> + <link rel="stylesheet" href="chrome://resources/css/text_defaults.css"> + <link rel="stylesheet" href="chrome://resources/css/apps/common.css"></link> + <link rel="stylesheet" href="chrome://resources/css/apps/topbutton_bar.css"> + </link> + <link rel="stylesheet" href="../css/feedback.css"> -<script src="chrome://resources/js/load_time_data.js"></script> -<script src="chrome://resources/js/i18n_template_no_process.js"></script> -<script src="chrome://resources/js/util.js"></script> -<script src="../js/feedback_util.js"></script> -<script src="../js/take_screenshot.js"></script> -<script src="../js/topbar_handlers.js"></script> -<script src="../js/feedback.js"></script> + <script src="chrome://resources/js/load_time_data.js"></script> + <script src="chrome://resources/js/i18n_template_no_process.js"></script> + <script src="chrome://resources/js/util.js"></script> + <script src="../js/feedback_util.js"></script> + <script src="../js/take_screenshot.js"></script> + <script src="../js/topbar_handlers.js"></script> + <script src="../js/feedback.js"></script> </head> <body> <div id="title-bar" class="title-bar"> - <span id="page-title" i18n-content="page-title"></span> + <span id="page-title" i18n-content="pageTitle"></span> <span class="topbutton-bar"> <button class="minimize-button" id="minimize-button" tabindex="-1" i18n-values="aria-label:minimizeBtnLabel"> diff --git a/chromium/chrome/browser/resources/feedback/js/event_handler.js b/chromium/chrome/browser/resources/feedback/js/event_handler.js index 5f9b2397257..ac5f433853d 100644 --- a/chromium/chrome/browser/resources/feedback/js/event_handler.js +++ b/chromium/chrome/browser/resources/feedback/js/event_handler.js @@ -21,11 +21,12 @@ const FEEDBACK_HEIGHT = 610; */ const FEEDBACK_DEFAULT_WINDOW_ID = 'default_window'; +// List of extension IDs that are permitted to invoke Feedback. // To generate a hashed extension ID, use a sha-1 hash, all in lower case. // Example: // echo -n 'abcdefghijklmnopqrstuvwxyzabcdef' | sha1sum | \ // awk '{print toupper($1)}' -const whitelistedExtensionIds = [ +const feedbackCallerExtensions = [ '12E618C3C6E97495AAECF2AC12DEB082353241C6', // QuickOffice '3727DD3E564B6055387425027AD74C58784ACC15', // QuickOffice '2FC374607C2DF285634B67C64A2E356C607091C3', // QuickOffice @@ -221,16 +222,16 @@ class FeedbackRequest { } /** - * Function to determine whether or not a given extension id is whitelisted to - * invoke the feedback UI. If the extension is whitelisted, the callback to - * start the Feedback UI will be called. + * Function to determine whether or not a given extension id is allowed to + * invoke the feedback UI. If it is, the callback to start the Feedback UI will + * be called. * @param {string} id the id of the sender extension. * @param {Function} startFeedbackCallback The callback function that will * will start the feedback UI. * @param {Object} feedbackInfo The feedback info object to pass to the * start feedback UI callback. */ -function senderWhitelisted(id, startFeedbackCallback, feedbackInfo) { +function invokeFeedbackIfPermitted(id, startFeedbackCallback, feedbackInfo) { crypto.subtle.digest('SHA-1', new TextEncoder().encode(id)) .then(function(hashBuffer) { let hashString = ''; @@ -240,7 +241,7 @@ function senderWhitelisted(id, startFeedbackCallback, feedbackInfo) { hashString += n < 0x10 ? '0' : ''; hashString += n.toString(16); } - if (whitelistedExtensionIds.indexOf(hashString.toUpperCase()) != -1) { + if (feedbackCallerExtensions.indexOf(hashString.toUpperCase()) != -1) { startFeedbackCallback(feedbackInfo); } }); @@ -267,7 +268,7 @@ function feedbackReadyHandler(request, sender, sendResponse) { */ function requestFeedbackHandler(request, sender, sendResponse) { if (request.requestFeedback) { - senderWhitelisted(sender.id, startFeedbackUI, request.feedbackInfo); + invokeFeedbackIfPermitted(sender.id, startFeedbackUI, request.feedbackInfo); } } |