Commit ed5f1fb4 authored by Zentaro Kavanagh's avatar Zentaro Kavanagh Committed by Commit Bot

Scanning: import strings.m.js not strings.js

- New code should import the .m.js version which does not try to
  initialize loadTimeData during import which causes an order
  dependency on imports.
- Also ran git cl format --js to format/sort the imports

Bug: None
Test: browser_tests --gtest_filter=ScanningApp*
Change-Id: Ie365b9563bca357b9467f556a5c12d28788b9716
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2477515
Commit-Queue: Zentaro Kavanagh <zentaro@chromium.org>
Reviewed-by: default avatarJesse Schettler <jschettler@chromium.org>
Auto-Submit: Zentaro Kavanagh <zentaro@chromium.org>
Cr-Commit-Position: refs/heads/master@{#817702}
parent b371f2a4
...@@ -4,11 +4,12 @@ ...@@ -4,11 +4,12 @@
import './scanning.mojom-lite.js'; import './scanning.mojom-lite.js';
import './scan_settings_section.js'; import './scan_settings_section.js';
import './strings.m.js';
import {getColorModeString} from './scanning_app_util.js';
import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js'; import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
import './strings.js'; import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
import {getColorModeString} from './scanning_app_util.js';
/** @type {number} */ /** @type {number} */
const NUM_REQUIRED_COLOR_MODES = 2; const NUM_REQUIRED_COLOR_MODES = 2;
......
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
import './scanning.mojom-lite.js'; import './scanning.mojom-lite.js';
import './scan_settings_section.js'; import './scan_settings_section.js';
import './strings.m.js';
import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js'; import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
import './strings.js'; import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
/** /**
* @fileoverview * @fileoverview
......
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
import './scanning.mojom-lite.js'; import './scanning.mojom-lite.js';
import './scan_settings_section.js'; import './scan_settings_section.js';
import './strings.m.js';
import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js'; import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
import './strings.js'; import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
/** @type {number} */ /** @type {number} */
const NUM_REQUIRED_RESOLUTIONS = 2; const NUM_REQUIRED_RESOLUTIONS = 2;
......
...@@ -7,13 +7,14 @@ import 'chrome://resources/mojo/mojo/public/mojom/base/string16.mojom-lite.js'; ...@@ -7,13 +7,14 @@ import 'chrome://resources/mojo/mojo/public/mojom/base/string16.mojom-lite.js';
import 'chrome://resources/mojo/mojo/public/mojom/base/unguessable_token.mojom-lite.js'; import 'chrome://resources/mojo/mojo/public/mojom/base/unguessable_token.mojom-lite.js';
import './scanning.mojom-lite.js'; import './scanning.mojom-lite.js';
import './scan_settings_section.js'; import './scan_settings_section.js';
import './strings.m.js';
import './throbber_css.js'; import './throbber_css.js';
import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js'; import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
import {ScannerArr} from './scanning_app_types.js'; import {ScannerArr} from './scanning_app_types.js';
import {tokenToString} from './scanning_app_util.js'; import {tokenToString} from './scanning_app_util.js';
import './strings.js';
/** @type {number} */ /** @type {number} */
const NUM_REQUIRED_SCANNERS = 2; const NUM_REQUIRED_SCANNERS = 2;
......
...@@ -4,11 +4,12 @@ ...@@ -4,11 +4,12 @@
import './scanning.mojom-lite.js'; import './scanning.mojom-lite.js';
import './scan_settings_section.js'; import './scan_settings_section.js';
import './strings.m.js';
import {getSourceTypeString} from './scanning_app_util.js';
import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js'; import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
import './strings.js'; import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
import {getSourceTypeString} from './scanning_app_util.js';
/** @type {number} */ /** @type {number} */
const NUM_REQUIRED_SOURCES = 2; const NUM_REQUIRED_SOURCES = 2;
......
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