Commit 55a751d5 authored by Demetrios Papadopoulos's avatar Demetrios Papadopoulos Committed by Commit Bot

Fix remaining web_dev_style violations under src/components.

This is in preparation of turning on such PRESUBMIT checks for src/components.

Bug: 1019312
Change-Id: I352cf547b8ea51cb6eba3a8715122c2129948cc6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1902065
Auto-Submit: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Esmael Elmoslimany <aee@chromium.org>
Reviewed-by: default avatarEsmael Elmoslimany <aee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713484}
parent d94b0217
...@@ -30,8 +30,8 @@ __gCrWeb['passwords'] = __gCrWeb.passwords; ...@@ -30,8 +30,8 @@ __gCrWeb['passwords'] = __gCrWeb.passwords;
*/ */
__gCrWeb.passwords['findPasswordForms'] = function() { __gCrWeb.passwords['findPasswordForms'] = function() {
var formDataList = []; var formDataList = [];
if (hasPasswordField_(window)) { if (hasPasswordField(window)) {
getPasswordFormDataList_(formDataList, window); getPasswordFormDataList(formDataList, window);
} }
return __gCrWeb.stringify(formDataList); return __gCrWeb.stringify(formDataList);
}; };
...@@ -43,7 +43,7 @@ __gCrWeb.passwords['findPasswordForms'] = function() { ...@@ -43,7 +43,7 @@ __gCrWeb.passwords['findPasswordForms'] = function() {
* contain an input field of type 'password'. * contain an input field of type 'password'.
* @return {boolean} * @return {boolean}
*/ */
var hasPasswordField_ = function(win) { var hasPasswordField = function(win) {
var doc = win.document; var doc = win.document;
// We may will not be allowed to read the 'document' property from a frame // We may will not be allowed to read the 'document' property from a frame
...@@ -56,16 +56,16 @@ var hasPasswordField_ = function(win) { ...@@ -56,16 +56,16 @@ var hasPasswordField_ = function(win) {
return true; return true;
} }
return getSameOriginFrames_(win).some(hasPasswordField_); return getSameOriginFrames(win).some(hasPasswordField);
}; };
/** /**
* Returns the contentWindow of all iframes that are from the the same origin * Returns the contentWindow of all iframes that are from the the same origin
* as the containing window. * as the containing window.
* @param {Window} win The window in which to look for frames. * @param {Window} win The window in which to look for frames.
* @return {Array.<Window>} Array of the same-origin frames found. * @return {Array<Window>} Array of the same-origin frames found.
*/ */
var getSameOriginFrames_ = function(win) { var getSameOriginFrames = function(win) {
var frames = win.document.getElementsByTagName('iframe'); var frames = win.document.getElementsByTagName('iframe');
var result = []; var result = [];
for (var i = 0; i < frames.length; i++) { for (var i = 0; i < frames.length; i++) {
...@@ -84,7 +84,7 @@ var getSameOriginFrames_ = function(win) { ...@@ -84,7 +84,7 @@ var getSameOriginFrames_ = function(win) {
* a proxy for onclick event because onclick handling might be prevented by * a proxy for onclick event because onclick handling might be prevented by
* the site JavaScript. * the site JavaScript.
*/ */
var addSubmitButtonTouchEndHandler_ = function(form) { var addSubmitButtonTouchEndHandler = function(form) {
if (form.querySelector('input[type=submit]')) { if (form.querySelector('input[type=submit]')) {
return; return;
} }
...@@ -99,7 +99,7 @@ var addSubmitButtonTouchEndHandler_ = function(form) { ...@@ -99,7 +99,7 @@ var addSubmitButtonTouchEndHandler_ = function(form) {
} }
} }
for (var i = 0; i < buttons.length; ++i) { for (var i = 0; i < buttons.length; ++i) {
buttons[0].addEventListener('touchend', onSubmitButtonTouchEnd_); buttons[0].addEventListener('touchend', onSubmitButtonTouchEnd);
} }
}; };
...@@ -107,7 +107,7 @@ var addSubmitButtonTouchEndHandler_ = function(form) { ...@@ -107,7 +107,7 @@ var addSubmitButtonTouchEndHandler_ = function(form) {
* Click handler for the submit button. It sends to the host * Click handler for the submit button. It sends to the host
* form.submitButtonClick command. * form.submitButtonClick command.
*/ */
var onSubmitButtonTouchEnd_ = function(evt) { var onSubmitButtonTouchEnd = function(evt) {
var form = evt.currentTarget.form; var form = evt.currentTarget.form;
var formData = __gCrWeb.passwords.getPasswordFormData(form); var formData = __gCrWeb.passwords.getPasswordFormData(form);
if (!formData) { if (!formData) {
...@@ -120,11 +120,11 @@ var onSubmitButtonTouchEnd_ = function(evt) { ...@@ -120,11 +120,11 @@ var onSubmitButtonTouchEnd_ = function(evt) {
/** /**
* Returns the element from |inputs| which has the field identifier equal to * Returns the element from |inputs| which has the field identifier equal to
* |identifier| and null if there is no such element. * |identifier| and null if there is no such element.
* @param {Array.<HTMLInputElement>} inputs * @param {Array<HTMLInputElement>} inputs
* @param {string} identifier * @param {string} identifier
* @return {HTMLInputElement} * @return {HTMLInputElement}
*/ */
var findInputByFieldIdentifier_ = function(inputs, identifier) { var findInputByFieldIdentifier = function(inputs, identifier) {
for (var i = 0; i < inputs.length; ++i) { for (var i = 0; i < inputs.length; ++i) {
if (identifier == __gCrWeb.form.getFieldIdentifier(inputs[i])) { if (identifier == __gCrWeb.form.getFieldIdentifier(inputs[i])) {
return inputs[i]; return inputs[i];
...@@ -140,14 +140,14 @@ var findInputByFieldIdentifier_ = function(inputs, identifier) { ...@@ -140,14 +140,14 @@ var findInputByFieldIdentifier_ = function(inputs, identifier) {
* @param {string} identifier The name of the form to extract. * @param {string} identifier The name of the form to extract.
* @return {HTMLFormElement} The password form. * @return {HTMLFormElement} The password form.
*/ */
var getPasswordFormElement_ = function(win, identifier) { var getPasswordFormElement = function(win, identifier) {
var el = win.__gCrWeb.form.getFormElementFromIdentifier(identifier); var el = win.__gCrWeb.form.getFormElementFromIdentifier(identifier);
if (el) { if (el) {
return el; return el;
} }
var frames = getSameOriginFrames_(win); var frames = getSameOriginFrames(win);
for (var i = 0; i < frames.length; ++i) { for (var i = 0; i < frames.length; ++i) {
el = getPasswordFormElement_(frames[i], identifier); el = getPasswordFormElement(frames[i], identifier);
if (el) { if (el) {
return el; return el;
} }
...@@ -161,7 +161,7 @@ var getPasswordFormElement_ = function(win, identifier) { ...@@ -161,7 +161,7 @@ var getPasswordFormElement_ = function(win, identifier) {
* are returned. * are returned.
* @return {Array<HTMLInputElement>} * @return {Array<HTMLInputElement>}
*/ */
var getFormInputElements_ = function(form) { var getFormInputElements = function(form) {
return __gCrWeb.form.getFormControlElements(form).filter(function(element) { return __gCrWeb.form.getFormControlElements(form).filter(function(element) {
return element.tagName === 'INPUT'; return element.tagName === 'INPUT';
}); });
...@@ -173,7 +173,7 @@ var getFormInputElements_ = function(form) { ...@@ -173,7 +173,7 @@ var getFormInputElements_ = function(form) {
* @return {string} The password form. * @return {string} The password form.
*/ */
__gCrWeb.passwords['getPasswordFormDataAsString'] = function(identifier) { __gCrWeb.passwords['getPasswordFormDataAsString'] = function(identifier) {
var el = getPasswordFormElement_(window, identifier); var el = getPasswordFormElement(window, identifier);
if (!el) { if (!el) {
return '{}'; return '{}';
} }
...@@ -205,7 +205,7 @@ __gCrWeb.passwords['fillPasswordForm'] = function( ...@@ -205,7 +205,7 @@ __gCrWeb.passwords['fillPasswordForm'] = function(
if (!__gCrWeb.common.isSameOrigin(origin, normalizedOrigin)) { if (!__gCrWeb.common.isSameOrigin(origin, normalizedOrigin)) {
return false; return false;
} }
return fillPasswordFormWithData_( return fillPasswordFormWithData(
formData, username, password, window, opt_normalizedOrigin); formData, username, password, window, opt_normalizedOrigin);
}; };
...@@ -226,9 +226,9 @@ __gCrWeb.passwords['fillPasswordFormWithGeneratedPassword'] = function( ...@@ -226,9 +226,9 @@ __gCrWeb.passwords['fillPasswordFormWithGeneratedPassword'] = function(
if (!form) { if (!form) {
return false; return false;
} }
var inputs = getFormInputElements_(form); var inputs = getFormInputElements(form);
var newPasswordField = var newPasswordField =
findInputByFieldIdentifier_(inputs, newPasswordIdentifier); findInputByFieldIdentifier(inputs, newPasswordIdentifier);
if (!newPasswordField) { if (!newPasswordField) {
return false; return false;
} }
...@@ -237,7 +237,7 @@ __gCrWeb.passwords['fillPasswordFormWithGeneratedPassword'] = function( ...@@ -237,7 +237,7 @@ __gCrWeb.passwords['fillPasswordFormWithGeneratedPassword'] = function(
__gCrWeb.fill.setInputElementValue(password, newPasswordField); __gCrWeb.fill.setInputElementValue(password, newPasswordField);
} }
var confirmPasswordField = var confirmPasswordField =
findInputByFieldIdentifier_(inputs, confirmPasswordIdentifier); findInputByFieldIdentifier(inputs, confirmPasswordIdentifier);
if (confirmPasswordField && confirmPasswordField.value != password) { if (confirmPasswordField && confirmPasswordField.value != password) {
__gCrWeb.fill.setInputElementValue(password, confirmPasswordField); __gCrWeb.fill.setInputElementValue(password, confirmPasswordField);
} }
...@@ -256,7 +256,7 @@ __gCrWeb.passwords['fillPasswordFormWithGeneratedPassword'] = function( ...@@ -256,7 +256,7 @@ __gCrWeb.passwords['fillPasswordFormWithGeneratedPassword'] = function(
* @param {string=} opt_normalizedOrigin The origin URL to compare to. * @param {string=} opt_normalizedOrigin The origin URL to compare to.
* @return {boolean} Whether a form field has been filled. * @return {boolean} Whether a form field has been filled.
*/ */
var fillPasswordFormWithData_ = function( var fillPasswordFormWithData = function(
formData, username, password, win, opt_normalizedOrigin) { formData, username, password, win, opt_normalizedOrigin) {
var doc = win.document; var doc = win.document;
var forms = doc.forms; var forms = doc.forms;
...@@ -269,15 +269,15 @@ var fillPasswordFormWithData_ = function( ...@@ -269,15 +269,15 @@ var fillPasswordFormWithData_ = function(
if (formData.action != normalizedFormAction) { if (formData.action != normalizedFormAction) {
continue; continue;
} }
var inputs = getFormInputElements_(form); var inputs = getFormInputElements(form);
var usernameInput = var usernameInput =
findInputByFieldIdentifier_(inputs, formData.fields[0].name); findInputByFieldIdentifier(inputs, formData.fields[0].name);
if (usernameInput == null || !__gCrWeb.common.isTextField(usernameInput) || if (usernameInput == null || !__gCrWeb.common.isTextField(usernameInput) ||
usernameInput.disabled) { usernameInput.disabled) {
continue; continue;
} }
var passwordInput = var passwordInput =
findInputByFieldIdentifier_(inputs, formData.fields[1].name); findInputByFieldIdentifier(inputs, formData.fields[1].name);
if (passwordInput == null || passwordInput.type != 'password' || if (passwordInput == null || passwordInput.type != 'password' ||
passwordInput.readOnly || passwordInput.disabled) { passwordInput.readOnly || passwordInput.disabled) {
continue; continue;
...@@ -298,9 +298,9 @@ var fillPasswordFormWithData_ = function( ...@@ -298,9 +298,9 @@ var fillPasswordFormWithData_ = function(
} }
// Recursively invoke for all iframes. // Recursively invoke for all iframes.
var frames = getSameOriginFrames_(win); var frames = getSameOriginFrames(win);
for (var i = 0; i < frames.length; i++) { for (var i = 0; i < frames.length; i++) {
if (fillPasswordFormWithData_( if (fillPasswordFormWithData(
formData, username, password, frames[i], opt_normalizedOrigin)) { formData, username, password, frames[i], opt_normalizedOrigin)) {
filled = true; filled = true;
} }
...@@ -312,26 +312,26 @@ var fillPasswordFormWithData_ = function( ...@@ -312,26 +312,26 @@ var fillPasswordFormWithData_ = function(
/** /**
* Finds all forms with passwords in the supplied window or frame and appends * Finds all forms with passwords in the supplied window or frame and appends
* JS objects containing the form data to |formDataList|. * JS objects containing the form data to |formDataList|.
* @param {!Array.<Object>} formDataList A list that this function populates * @param {!Array<Object>} formDataList A list that this function populates
* with descriptions of discovered forms. * with descriptions of discovered forms.
* @param {Window} win A window (or frame) in which the function should * @param {Window} win A window (or frame) in which the function should
* look for password forms. * look for password forms.
*/ */
var getPasswordFormDataList_ = function(formDataList, win) { var getPasswordFormDataList = function(formDataList, win) {
var doc = win.document; var doc = win.document;
var forms = doc.forms; var forms = doc.forms;
for (var i = 0; i < forms.length; i++) { for (var i = 0; i < forms.length; i++) {
var formData = __gCrWeb.passwords.getPasswordFormData(forms[i]); var formData = __gCrWeb.passwords.getPasswordFormData(forms[i]);
if (formData) { if (formData) {
formDataList.push(formData); formDataList.push(formData);
addSubmitButtonTouchEndHandler_(forms[i]); addSubmitButtonTouchEndHandler(forms[i]);
} }
} }
// Recursively invoke for all iframes. // Recursively invoke for all iframes.
var frames = getSameOriginFrames_(win); var frames = getSameOriginFrames(win);
for (var i = 0; i < frames.length; i++) { for (var i = 0; i < frames.length; i++) {
getPasswordFormDataList_(formDataList, frames[i]); getPasswordFormDataList(formDataList, frames[i]);
} }
}; };
......
...@@ -135,18 +135,17 @@ function setupEvents() { ...@@ -135,18 +135,17 @@ function setupEvents() {
} }
if (lookalike) { if (lookalike) {
var proceed_button = 'proceed-button'; var proceedButton = 'proceed-button';
var dont_proceed_link = 'dont-proceed-link'; var dontProceedLink = 'dont-proceed-link';
$(proceed_button).classList.remove(HIDDEN_CLASS); $(proceedButton).classList.remove(HIDDEN_CLASS);
$(proceed_button).textContent = $(proceedButton).textContent = loadTimeData.getString('proceedButtonText');
loadTimeData.getString('proceedButtonText');
$(proceed_button).addEventListener('click', function(event) { $(proceedButton).addEventListener('click', function(event) {
sendCommand(SecurityInterstitialCommandId.CMD_PROCEED); sendCommand(SecurityInterstitialCommandId.CMD_PROCEED);
}); });
$(dont_proceed_link).addEventListener('click', function(event) { $(dontProceedLink).addEventListener('click', function(event) {
sendCommand(SecurityInterstitialCommandId.CMD_DONT_PROCEED); sendCommand(SecurityInterstitialCommandId.CMD_DONT_PROCEED);
}); });
} }
...@@ -188,7 +187,6 @@ function setupEvents() { ...@@ -188,7 +187,6 @@ function setupEvents() {
}); });
} }
var details_id = null;
if (captivePortal || billing || lookalike) { if (captivePortal || billing || lookalike) {
// Captive portal, billing and lookalike pages don't have details buttons. // Captive portal, billing and lookalike pages don't have details buttons.
$('details-button').classList.add('hidden'); $('details-button').classList.add('hidden');
......
...@@ -15,7 +15,7 @@ logs only clicks, but not mouse movement. ...@@ -15,7 +15,7 @@ logs only clicks, but not mouse movement.
current site and will get the next site. current site and will get the next site.
6. Repeat steps 4-5 till all sites have been visited. 6. Repeat steps 4-5 till all sites have been visited.
7. You can output the tests for all sites you visited, if you print the value 7. You can output the tests for all sites you visited, if you print the value
of the variable "all_tests" in background page's console. of the variable "allTests" in background page's console.
8. Copy the generated code into the source code of the form classifier tests 8. Copy the generated code into the source code of the form classifier tests
(components/test/data/password_manager/form_classification_tests). (components/test/data/password_manager/form_classification_tests).
......
...@@ -33,11 +33,11 @@ var IS_PWD_CREATION_VALUE = 'False'; ...@@ -33,11 +33,11 @@ var IS_PWD_CREATION_VALUE = 'False';
var steps = []; var steps = [];
/** /**
* The index of the last visited site from |sites_to_visit| (sites_to_visit.js). * The index of the last visited site from |sitesToVisit| (sites_to_visit.js).
* *
* @type {number} * @type {number}
*/ */
var last_visited_site_index = 0; var lastVisitedSiteIndex = 0;
/** /**
* Generated Python tests. * Generated Python tests.
...@@ -51,7 +51,7 @@ var last_visited_site_index = 0; ...@@ -51,7 +51,7 @@ var last_visited_site_index = 0;
* *
* @type {string} * @type {string}
*/ */
var all_tests = '\n'; var allTests = '\n';
/** /**
* Return the name of the test based on the form's url |url| * Return the name of the test based on the form's url |url|
...@@ -116,7 +116,7 @@ function switchToIframeIfNecessary(step) { ...@@ -116,7 +116,7 @@ function switchToIframeIfNecessary(step) {
/** /**
* Outputs to the console the code of a Python test based on script steps * Outputs to the console the code of a Python test based on script steps
* accumulated in |steps|. Also appends the test code to |all_tests|. * accumulated in |steps|. Also appends the test code to |allTests|.
*/ */
function outputPythonTestCode() { function outputPythonTestCode() {
var lastStepUrl = stripUrl(steps[steps.length - 1].url); var lastStepUrl = stripUrl(steps[steps.length - 1].url);
...@@ -139,7 +139,7 @@ function outputPythonTestCode() { ...@@ -139,7 +139,7 @@ function outputPythonTestCode() {
test += '\n'; test += '\n';
console.log(test); console.log(test);
all_tests += test; allTests += test;
steps = []; steps = [];
} }
...@@ -147,12 +147,12 @@ function outputPythonTestCode() { ...@@ -147,12 +147,12 @@ function outputPythonTestCode() {
* Moves the current tab to the next site. * Moves the current tab to the next site.
*/ */
function visitNextSite() { function visitNextSite() {
console.log('next site: ' + sites_to_visit[last_visited_site_index] + ' ' + console.log(
last_visited_site_index); 'next site: ' + sitesToVisit[lastVisitedSiteIndex] + ' ' +
chrome.tabs.update( lastVisitedSiteIndex);
{url: 'http://' + sites_to_visit[last_visited_site_index]}); chrome.tabs.update({url: 'http://' + sitesToVisit[lastVisitedSiteIndex]});
steps = []; steps = [];
last_visited_site_index += 1; lastVisitedSiteIndex += 1;
} }
/** /**
......
...@@ -126,8 +126,8 @@ function getFrames(elem) { ...@@ -126,8 +126,8 @@ function getFrames(elem) {
console.error('frameElement is null. Unable to fetch data about iframes'); console.error('frameElement is null. Unable to fetch data about iframes');
break; break;
} }
var iframe_selector = getSmartSelector(frameElement); var iframeSelector = getSmartSelector(frameElement);
frames.unshift(iframe_selector); frames.unshift(iframeSelector);
elem = elem.ownerDocument.defaultView.frameElement; elem = elem.ownerDocument.defaultView.frameElement;
} }
return frames; return frames;
......
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