Commit 603963b8 authored by Roman Sorokin's avatar Roman Sorokin Committed by Commit Bot

OOBE Dialog: Link oobe_dialog_host everywhere oobe-dialog is used

Files found with:
grep -L oobe_dialog_host `git grep --files-with-matches oobe-dialog | grep html`

Bug: 1000606
Change-Id: I9d7f12253b1e9508a4a9f7096aa0ce2fc0e8fcc8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1844963Reviewed-by: default avatarAlexander Alekseev <alemate@chromium.org>
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703724}
parent 6f0f11cd
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<dom-module id="assistant-get-more"> <dom-module id="assistant-get-more">
<template> <template>
<link rel="stylesheet" href="../login/oobe_dialog_host.css">
<link rel="stylesheet" href="../login/oobe_flex_layout.css"> <link rel="stylesheet" href="../login/oobe_flex_layout.css">
<link rel="stylesheet" href="assistant_get_more.css"> <link rel="stylesheet" href="assistant_get_more.css">
<link rel="stylesheet" href="assistant_shared_styles.css"> <link rel="stylesheet" href="assistant_shared_styles.css">
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<link rel="import" href="chrome://resources/polymer/v1_0/paper-progress/paper-progress.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-progress/paper-progress.html">
<dom-module id="assistant-loading"> <dom-module id="assistant-loading">
<template> <template>
<link rel="stylesheet" href="../login/oobe_dialog_host.css">
<link rel="stylesheet" href="../login/oobe_flex_layout.css"> <link rel="stylesheet" href="../login/oobe_flex_layout.css">
<link rel="stylesheet" href="assistant_loading.css"> <link rel="stylesheet" href="assistant_loading.css">
<link rel="stylesheet" href="assistant_shared_styles.css"> <link rel="stylesheet" href="assistant_shared_styles.css">
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<dom-module id="assistant-third-party"> <dom-module id="assistant-third-party">
<template> <template>
<link rel="stylesheet" href="../login/oobe_dialog_host.css">
<link rel="stylesheet" href="../login/oobe_flex_layout.css"> <link rel="stylesheet" href="../login/oobe_flex_layout.css">
<link rel="stylesheet" href="../login/oobe_popup_overlay.css"> <link rel="stylesheet" href="../login/oobe_popup_overlay.css">
<link rel="stylesheet" href="assistant_shared_styles.css"> <link rel="stylesheet" href="assistant_shared_styles.css">
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-collapse.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-collapse.html">
<dom-module id="assistant-value-prop"> <dom-module id="assistant-value-prop">
<template> <template>
<link rel="stylesheet" href="../login/oobe_dialog_host.css">
<link rel="stylesheet" href="../login/oobe_flex_layout.css"> <link rel="stylesheet" href="../login/oobe_flex_layout.css">
<link rel="stylesheet" href="../login/oobe_popup_overlay.css"> <link rel="stylesheet" href="../login/oobe_popup_overlay.css">
<link rel="stylesheet" href="assistant_shared_styles.css"> <link rel="stylesheet" href="assistant_shared_styles.css">
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<link rel="import" href="chrome://resources/cr_elements/chromeos/cr_lottie/cr_lottie.html"> <link rel="import" href="chrome://resources/cr_elements/chromeos/cr_lottie/cr_lottie.html">
<dom-module id="assistant-voice-match"> <dom-module id="assistant-voice-match">
<template> <template>
<link rel="stylesheet" href="../login/oobe_dialog_host.css">
<link rel="stylesheet" href="../login/oobe_flex_layout.css"> <link rel="stylesheet" href="../login/oobe_flex_layout.css">
<link rel="stylesheet" href="assistant_shared_styles.css"> <link rel="stylesheet" href="assistant_shared_styles.css">
<link rel="stylesheet" href="assistant_voice_match.css"> <link rel="stylesheet" href="assistant_voice_match.css">
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<dom-module id="app-downloading"> <dom-module id="app-downloading">
<template> <template>
<link rel="stylesheet" href="oobe_dialog_host.css">
<link rel="stylesheet" href="app_downloading.css"> <link rel="stylesheet" href="app_downloading.css">
<link rel="stylesheet" href="oobe_flex_layout.css"> <link rel="stylesheet" href="oobe_flex_layout.css">
<oobe-dialog id="app-downloading-dialog" role="dialog" has-buttons <oobe-dialog id="app-downloading-dialog" role="dialog" has-buttons
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<dom-module id="arc-tos-root"> <dom-module id="arc-tos-root">
<template> <template>
<link rel="stylesheet" href="oobe_dialog_host.css">
<link rel="stylesheet" href="arc_terms_of_service.css"> <link rel="stylesheet" href="arc_terms_of_service.css">
<link rel="stylesheet" href="oobe_flex_layout.css"> <link rel="stylesheet" href="oobe_flex_layout.css">
<oobe-dialog id="arc-tos-dialog" has-buttons class="arc-tos-loading"> <oobe-dialog id="arc-tos-dialog" has-buttons class="arc-tos-loading">
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<dom-module id="demo-preferences-md"> <dom-module id="demo-preferences-md">
<template> <template>
<link rel="stylesheet" href="oobe_dialog_host.css">
<link rel="stylesheet" href="demo_preferences.css"> <link rel="stylesheet" href="demo_preferences.css">
<link rel="stylesheet" href="oobe_flex_layout.css"> <link rel="stylesheet" href="oobe_flex_layout.css">
<oobe-dialog role="dialog" has-buttons <oobe-dialog role="dialog" has-buttons
...@@ -82,4 +83,4 @@ ...@@ -82,4 +83,4 @@
</div> </div>
</oobe-dialog> </oobe-dialog>
</template> </template>
</dom-module> </dom-module>
\ No newline at end of file
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
<dom-module id="demo-setup-md"> <dom-module id="demo-setup-md">
<template> <template>
<link rel="stylesheet" href="oobe_dialog_host.css">
<link rel="stylesheet" href="demo_setup.css"> <link rel="stylesheet" href="demo_setup.css">
<link rel="stylesheet" href="oobe_flex_layout.css"> <link rel="stylesheet" href="oobe_flex_layout.css">
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<dom-module id="encryption-migration"> <dom-module id="encryption-migration">
<template> <template>
<link rel="stylesheet" href="oobe_dialog_host.css">
<link rel="stylesheet" href="encryption_migration.css"> <link rel="stylesheet" href="encryption_migration.css">
<link rel="stylesheet" href="oobe_flex_layout.css"> <link rel="stylesheet" href="oobe_flex_layout.css">
<template is="dom-if" if="[[isInitial_(uiState)]]"> <template is="dom-if" if="[[isInitial_(uiState)]]">
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
<style <style
include="shared-style iron-flex iron-flex-alignment iron-positioning"> include="shared-style iron-flex iron-flex-alignment iron-positioning">
</style> </style>
<link rel="stylesheet" href="oobe_dialog_host.css">
<link rel="stylesheet" href="oobe_iron_flex_layout_fix.css"> <link rel="stylesheet" href="oobe_iron_flex_layout_fix.css">
<oobe-dialog id="license-selection-prompt-card" has-buttons> <oobe-dialog id="license-selection-prompt-card" has-buttons>
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
<dom-module id="fingerprint-setup"> <dom-module id="fingerprint-setup">
<template> <template>
<link rel="stylesheet" href="oobe_dialog_host.css">
<link rel="stylesheet" href="fingerprint_setup.css"> <link rel="stylesheet" href="fingerprint_setup.css">
<link rel="stylesheet" href="oobe_flex_layout.css"> <link rel="stylesheet" href="oobe_flex_layout.css">
<oobe-dialog id="setupFingerprint" role="dialog" has-buttons <oobe-dialog id="setupFingerprint" role="dialog" has-buttons
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
<dom-module id="marketing-opt-in"> <dom-module id="marketing-opt-in">
<template> <template>
<link rel="stylesheet" href="oobe_dialog_host.css">
<link rel="stylesheet" href="marketing_opt_in.css"> <link rel="stylesheet" href="marketing_opt_in.css">
<link rel="stylesheet" href="oobe_flex_layout.css"> <link rel="stylesheet" href="oobe_flex_layout.css">
<oobe-dialog id="marketingOptInOverviewDialog" role="dialog" has-buttons <oobe-dialog id="marketingOptInOverviewDialog" role="dialog" has-buttons
......
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
<template> <template>
<style include="md-select iron-flex iron-flex-alignment iron-positioning"> <style include="md-select iron-flex iron-flex-alignment iron-positioning">
</style> </style>
<link rel="stylesheet" href="oobe_dialog_host.css">
<link rel="stylesheet" href="oobe_iron_flex_layout_fix.css"> <link rel="stylesheet" href="oobe_iron_flex_layout_fix.css">
<link rel="stylesheet" href="offline_ad_login.css"> <link rel="stylesheet" href="offline_ad_login.css">
<oobe-dialog id="unlockStep" hidden="[[!unlockPasswordStep]]" <oobe-dialog id="unlockStep" hidden="[[!unlockPasswordStep]]"
......
...@@ -16,7 +16,10 @@ ...@@ -16,7 +16,10 @@
focused. focused.
2. 'show-dialog' is fired. 2. 'show-dialog' is fired.
Please include oobe_dialog_host.css if you use oobe-dialog.
Example: Example:
<link rel="stylesheet" href="oobe_dialog_host.css">
<oobe-dialog on-show-dialog="onTestDialogShown_" has-buttons> <oobe-dialog on-show-dialog="onTestDialogShown_" has-buttons>
<iron-icon ... slot="oobe-icon"> <iron-icon ... slot="oobe-icon">
<h1 slot="title">Title</h1> <h1 slot="title">Title</h1>
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
<dom-module id="oobe-eula-md"> <dom-module id="oobe-eula-md">
<template> <template>
<link rel="stylesheet" href="oobe_dialog_host.css">
<link rel="stylesheet" href="chrome://resources/css/throbber.css"> <link rel="stylesheet" href="chrome://resources/css/throbber.css">
<link rel="stylesheet" href="oobe_eula.css"> <link rel="stylesheet" href="oobe_eula.css">
<link rel="stylesheet" href="oobe_flex_layout.css"> <link rel="stylesheet" href="oobe_flex_layout.css">
......
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
<dom-module id="oobe-hid-detection-md"> <dom-module id="oobe-hid-detection-md">
<template> <template>
<link rel="stylesheet" href="oobe_dialog_host.css">
<link rel="stylesheet" href="oobe_hid_detection.css"> <link rel="stylesheet" href="oobe_hid_detection.css">
<link rel="stylesheet" href="oobe_flex_layout.css"> <link rel="stylesheet" href="oobe_flex_layout.css">
<oobe-dialog has-buttons> <oobe-dialog has-buttons>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<dom-module id="oobe-network-md"> <dom-module id="oobe-network-md">
<template> <template>
<link rel="stylesheet" href="oobe_dialog_host.css">
<link rel="stylesheet" href="oobe_flex_layout.css"> <link rel="stylesheet" href="oobe_flex_layout.css">
<link rel="stylesheet" href="oobe_network.css"> <link rel="stylesheet" href="oobe_network.css">
<oobe-dialog id="networkDialog" role="dialog" on-show-dialog="onShown_" <oobe-dialog id="networkDialog" role="dialog" on-show-dialog="onShown_"
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
<dom-module id="oobe-reset-md"> <dom-module id="oobe-reset-md">
<template> <template>
<link rel="stylesheet" href="oobe_dialog_host.css">
<link rel="stylesheet" href="chrome://resources/css/throbber.css"> <link rel="stylesheet" href="chrome://resources/css/throbber.css">
<link rel="stylesheet" href="oobe_flex_layout.css"> <link rel="stylesheet" href="oobe_flex_layout.css">
<link rel="stylesheet" href="oobe_reset.css"> <link rel="stylesheet" href="oobe_reset.css">
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<dom-module id="supervision-transition-md"> <dom-module id="supervision-transition-md">
<template> <template>
<link rel="stylesheet" href="oobe_dialog_host.css">
<link rel="stylesheet" href="oobe_flex_layout.css"> <link rel="stylesheet" href="oobe_flex_layout.css">
<link rel="stylesheet" href="oobe_supervision_transition.css"> <link rel="stylesheet" href="oobe_supervision_transition.css">
<oobe-dialog id="supervisionTransitionDialog" role="alert" <oobe-dialog id="supervisionTransitionDialog" role="alert"
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
<dom-module id="oobe-update-md"> <dom-module id="oobe-update-md">
<template> <template>
<link rel="stylesheet" href="oobe_dialog_host.css">
<link rel="stylesheet" href="oobe_flex_layout.css"> <link rel="stylesheet" href="oobe_flex_layout.css">
<link rel="stylesheet" href="oobe_update.css"> <link rel="stylesheet" href="oobe_update.css">
<oobe-dialog hidden="[[!checkingForUpdate]]" tabindex="0" <oobe-dialog hidden="[[!checkingForUpdate]]" tabindex="0"
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<dom-module id="recommend-apps"> <dom-module id="recommend-apps">
<template> <template>
<link rel="stylesheet" href="oobe_dialog_host.css">
<link rel="stylesheet" href="recommend_apps.css"> <link rel="stylesheet" href="recommend_apps.css">
<link rel="stylesheet" href="oobe_flex_layout.css"> <link rel="stylesheet" href="oobe_flex_layout.css">
<oobe-dialog id="recommend-apps-dialog" role="dialog" has-buttons <oobe-dialog id="recommend-apps-dialog" role="dialog" has-buttons
......
<link rel="import" href="chrome://oobe/custom_elements.html"> <link rel="import" href="chrome://oobe/custom_elements.html">
<div id="error-message" class="step hidden show-offline-error" hidden> <div id="error-message" class="step hidden show-offline-error" hidden>
<link rel="stylesheet" href="oobe_dialog_host.css">
<link rel="stylesheet" href="oobe_flex_layout.css"> <link rel="stylesheet" href="oobe_flex_layout.css">
<iron-iconset-svg name="error-message-24" size="24"> <iron-iconset-svg name="error-message-24" size="24">
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
found in the LICENSE file. --> found in the LICENSE file. -->
<div class="step right hidden" id="recommend-apps" hidden> <div class="step right hidden" id="recommend-apps" hidden>
<link rel="stylesheet" href="oobe_dialog_host.css">
<recommend-apps id="recommend-apps-screen" hidden></recommend-apps> <recommend-apps id="recommend-apps-screen" hidden></recommend-apps>
<oobe-dialog id="recommend-apps-loading" role="dialog" no-header <oobe-dialog id="recommend-apps-loading" role="dialog" no-header
no-footer-padding> no-footer-padding>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<link rel="import" href="chrome://oobe/custom_elements.html"> <link rel="import" href="chrome://oobe/custom_elements.html">
<div class="step right hidden" id="sync-consent" hidden> <div class="step right hidden" id="sync-consent" hidden>
<link rel="stylesheet" href="oobe_dialog_host.css">
<sync-consent id="sync-consent-impl"></sync-consent> <sync-consent id="sync-consent-impl"></sync-consent>
<oobe-dialog id="sync-loading" role="dialog" no-header no-footer-padding <oobe-dialog id="sync-loading" role="dialog" no-header no-footer-padding
hidden> hidden>
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<dom-module id="sync-consent"> <dom-module id="sync-consent">
<template> <template>
<link rel="stylesheet" href="oobe_dialog_host.css">
<link rel="stylesheet" href="sync_consent.css"> <link rel="stylesheet" href="sync_consent.css">
<link rel="stylesheet" href="oobe_flex_layout.css"> <link rel="stylesheet" href="oobe_flex_layout.css">
<oobe-dialog id="syncConsentOverviewDialog" role="dialog" has-buttons <oobe-dialog id="syncConsentOverviewDialog" role="dialog" has-buttons
......
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