Now that the setup flow must be embedded in both chrome://oobe and chrome://multidevice-setup, it no longer makes sense to embed separate resources in each page. All resources in [1] should be moved to chrome://resources. Specifically, they should be accessible via chrome://resources/cr_components/chromeos/multidevice_setup/*. See [2] for an example CL which does something similar. [1] https://cs.chromium.org/chromium/src/chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup_resources.grd [2] https://chromium-review.googlesource.com/c/chromium/src/+/1212404
Should be P2 since it blocks a P2 bug.
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/ce0b00a2c0cc141c71c34e3ecd7f357189f00aa8 commit ce0b00a2c0cc141c71c34e3ecd7f357189f00aa8 Author: Kyle Horimoto <khorimoto@google.com> Date: Mon Sep 17 19:41:33 2018 [CrOS MultiDevice] Decouple localized strings from setup flow dialog. Previously, the setup flow only was accessible via the dialog; however, we are now in the process of adding it as part of OOBE. This CL moves these strings to a common location which will be used in a subsequent CL to add these strings to OOBE. Bug: 884041 Change-Id: I539ff8e5de13a7ef59ed069361764759ece30d39 Reviewed-on: https://chromium-review.googlesource.com/1228479 Commit-Queue: Kyle Horimoto <khorimoto@chromium.org> Reviewed-by: Steven Bennetts <stevenjb@chromium.org> Cr-Commit-Position: refs/heads/master@{#591784} [modify] https://crrev.com/ce0b00a2c0cc141c71c34e3ecd7f357189f00aa8/chrome/browser/ui/BUILD.gn [modify] https://crrev.com/ce0b00a2c0cc141c71c34e3ecd7f357189f00aa8/chrome/browser/ui/webui/chromeos/multidevice_setup/multidevice_setup_dialog.cc [add] https://crrev.com/ce0b00a2c0cc141c71c34e3ecd7f357189f00aa8/chrome/browser/ui/webui/chromeos/multidevice_setup/multidevice_setup_localized_strings_provider.cc [add] https://crrev.com/ce0b00a2c0cc141c71c34e3ecd7f357189f00aa8/chrome/browser/ui/webui/chromeos/multidevice_setup/multidevice_setup_localized_strings_provider.h
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/e4b02117a9359cc7f27811af64f39c8475160c31 commit e4b02117a9359cc7f27811af64f39c8475160c31 Author: Kyle Horimoto <khorimoto@google.com> Date: Tue Sep 18 23:45:11 2018 [CrOS MultiDevice] Remove usage of $i18n{} from HTML resources. A future CL will move these resources to chrome://resources, which does not have support for $i18n (see [1]). Instead, each $i18n{foo} instance was replaced with [[i18n('foo')]]. [1] https://cs.chromium.org/chromium/src/ui/webui/resources/cr_components/README.md Bug: 884041 Change-Id: I4d6ee99f0cd66aee55cf12a47673fc01e46c87a4 Reviewed-on: https://chromium-review.googlesource.com/1232415 Commit-Queue: Kyle Horimoto <khorimoto@chromium.org> Reviewed-by: Steven Bennetts <stevenjb@chromium.org> Cr-Commit-Position: refs/heads/master@{#592264} [modify] https://crrev.com/e4b02117a9359cc7f27811af64f39c8475160c31/chrome/browser/resources/chromeos/multidevice_setup/password_page.html [modify] https://crrev.com/e4b02117a9359cc7f27811af64f39c8475160c31/chrome/browser/resources/chromeos/multidevice_setup/start_setup_page.html
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/9bace7fbb9a883ee3903b08233620c36c32aca90 commit 9bace7fbb9a883ee3903b08233620c36c32aca90 Author: Kyle Horimoto <khorimoto@google.com> Date: Fri Sep 21 23:36:48 2018 [CrOS MultiDevice] Refactor shared MultiDevice setup flow resources. The MultiDevice setup flow uses several HTML/JS resources to render the setup flow dialog. Previously, these files were added directly to the data source for chrome://multidevice-setup. Now that this UI is being shared between both chrome://multidevice-setup and chrome://oobe, the resources are moved to a shared location; namely, //ui/webui/resources/cr_components/chromeos/multidevice_setup. They are now served from chrome://resources/cr_components/chromeos/multidevice_setup/*. Bug: 884041 Change-Id: Ia69c27875a9d3600006c4220f498acc5a2aef7be Reviewed-on: https://chromium-review.googlesource.com/1232334 Commit-Queue: Kyle Horimoto <khorimoto@chromium.org> Reviewed-by: Steven Bennetts <stevenjb@chromium.org> Cr-Commit-Position: refs/heads/master@{#593378} [modify] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/WATCHLISTS [modify] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/chrome/browser/resources/chromeos/multidevice_setup/BUILD.gn [delete] https://crrev.com/862b6d0d12c51a9c7a99b8b0414e2ec0ddf72376/chrome/browser/resources/chromeos/multidevice_setup/fake_mojo_service.html [delete] https://crrev.com/862b6d0d12c51a9c7a99b8b0414e2ec0ddf72376/chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup.html [delete] https://crrev.com/862b6d0d12c51a9c7a99b8b0414e2ec0ddf72376/chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup_browser_proxy.html [modify] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup_dialog.html [modify] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup_resources.grd [delete] https://crrev.com/862b6d0d12c51a9c7a99b8b0414e2ec0ddf72376/chrome/browser/resources/chromeos/multidevice_setup/setup_failed_page.html [delete] https://crrev.com/862b6d0d12c51a9c7a99b8b0414e2ec0ddf72376/chrome/browser/resources/chromeos/multidevice_setup/ui_mode.html [delete] https://crrev.com/862b6d0d12c51a9c7a99b8b0414e2ec0ddf72376/chrome/browser/resources/chromeos/multidevice_setup/ui_page_container_behavior.html [modify] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/BUILD.gn [modify] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/BUILD.gn [add] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/.eslintrc.js [add] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/BUILD.gn [add] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/OWNERS [rename] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/button_bar.html [rename] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/button_bar.js [add] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/fake_mojo_service.html [rename] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/fake_mojo_service.js [rename] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/icons.html [rename] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/mojo_api_behavior.html [rename] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/mojo_api_behavior.js [add] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup.html [rename] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup.js [add] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_browser_proxy.html [rename] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_browser_proxy.js [rename] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_shared_css.html [rename] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/password_page.html [rename] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/password_page.js [add] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/setup_failed_page.html [rename] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/setup_failed_page.js [rename] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/setup_succeeded_icon_1x.png [rename] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/setup_succeeded_icon_2x.png [rename] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/setup_succeeded_page.html [rename] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/setup_succeeded_page.js [rename] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/start_setup_icon_1x.png [rename] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/start_setup_icon_2x.png [rename] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/start_setup_page.html [rename] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/start_setup_page.js [add] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/ui_mode.html [rename] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/ui_mode.js [rename] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/ui_page.html [rename] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/ui_page.js [add] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/ui_page_container_behavior.html [rename] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/chromeos/multidevice_setup/ui_page_container_behavior.js [add] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/cr_components_images.grdp [modify] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/cr_components/cr_components_resources.grdp [modify] https://crrev.com/9bace7fbb9a883ee3903b08233620c36c32aca90/ui/webui/resources/webui_resources.grd
Comment 1 by khorimoto@chromium.org
, Sep 14