Skip to content

GitLab

T
tangled
Commit 713f1583 authored by dpapad's avatar dpapad Committed by Chromium LUCI CQ
Browse files
Options

WebUI: Move cr.ui.ControlledIndicator to the only place it is used. 

This UI element is only used in c/b/r/chromeos/arc_support/ and does not
justify residing within shared WebUI code. Moreover it was previously
unnecessarily included in non-CrOS builds.

Bug: None
Change-Id: I0e2da5f89995b8d747bdeed11343e59ddaccedd0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2568609Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Reviewed-by: default avatarYury Khmel <khmel@chromium.org>
Commit-Queue: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836107}
parent 7c15190a
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 11 deletions
ui/webui/resources/css/controlled_indicator.css → chrome/browser/resources/chromeos/arc_support/controlled_indicator.css
View file @ 713f1583
...@@ -24,29 +24,29 @@ ...@@ -24,29 +24,29 @@
.controlled-setting-indicator:-webkit-any([controlled-by='recommended'], .controlled-setting-indicator:-webkit-any([controlled-by='recommended'],
[controlled-by='hasRecommendation']) > div, [controlled-by='hasRecommendation']) > div,
.controlled-setting-indicator[controlled-by='policy'] > div { .controlled-setting-indicator[controlled-by='policy'] > div {
background-image: url(../images/business.svg); background-image: url(../../../../../ui/webui/resources/images/business.svg);
} }
.controlled-setting-indicator[controlled-by='owner'] > div { .controlled-setting-indicator[controlled-by='owner'] > div {
background-image: url(../images/account_circle.svg); background-image: url(../../../../../ui/webui/resources/images/account_circle.svg);
} }
.controlled-setting-indicator[controlled-by='extension'] > div { .controlled-setting-indicator[controlled-by='extension'] > div {
background-image: url(../images/extension.svg); background-image: url(../../../../../ui/webui/resources/images/extension.svg);
} }
<if expr="chromeos"> <if expr="chromeos">
.controlled-setting-indicator[controlled-by='shared'] > div { .controlled-setting-indicator[controlled-by='shared'] > div {
background-image: url(../images/group.svg); background-image: url(../../../../../ui/webui/resources/images/group.svg);
} }
</if> </if>
.controlled-setting-indicator[controlled-by='child-custodian'] > div { .controlled-setting-indicator[controlled-by='child-custodian'] > div {
background-image: url(../images/account_child_invert.svg); background-image: url(../../../../../ui/webui/resources/images/account_child_invert.svg);
} }
.controlled-setting-indicator[controlled-by='supervised-user-custodian'] > div { .controlled-setting-indicator[controlled-by='supervised-user-custodian'] > div {
background-image: url(../images/supervisor_account.svg); background-image: url(../../../../../ui/webui/resources/images/supervisor_account.svg);
} }
.controlled-setting-bubble-action { .controlled-setting-bubble-action {
......
chrome/browser/resources/chromeos/arc_support/main.html
View file @ 713f1583
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<link rel="stylesheet" href="chrome://resources/css/roboto.css"> <link rel="stylesheet" href="chrome://resources/css/roboto.css">
<link rel="stylesheet" href="chrome://resources/css/bubble.css"> <link rel="stylesheet" href="chrome://resources/css/bubble.css">
<link rel="stylesheet" href="chrome://resources/css/bubble_button.css"> <link rel="stylesheet" href="chrome://resources/css/bubble_button.css">
<link rel="stylesheet" href="chrome://resources/css/controlled_indicator.css">
<link rel="stylesheet" href="chrome://resources/css/overlay.css"> <link rel="stylesheet" href="chrome://resources/css/overlay.css">
<link rel="stylesheet" href="controlled_indicator.css">
<link rel="stylesheet" href="main.css"> <link rel="stylesheet" href="main.css">
<link rel="stylesheet" href="progressbar.css"> <link rel="stylesheet" href="progressbar.css">
<link rel="stylesheet" href="../login/components/oobe_flex_layout.css"> <link rel="stylesheet" href="../login/components/oobe_flex_layout.css">
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
<script src="chrome://resources/js/cr/ui.js"></script> <script src="chrome://resources/js/cr/ui.js"></script>
<script src="chrome://resources/js/cr/ui/bubble.js"></script> <script src="chrome://resources/js/cr/ui/bubble.js"></script>
<script src="chrome://resources/js/cr/ui/bubble_button.js"></script> <script src="chrome://resources/js/cr/ui/bubble_button.js"></script>
<script src="chrome://resources/js/cr/ui/controlled_indicator.js"></script>
<script src="chrome://resources/js/cr/ui/overlay.js"></script> <script src="chrome://resources/js/cr/ui/overlay.js"></script>
<script src="chrome://resources/js/cr/ui/focus_manager.js"></script> <script src="chrome://resources/js/cr/ui/focus_manager.js"></script>
<script type="module" src="main.js"></script> <script type="module" src="main.js"></script>
<script src="arc_optin_focus_manager.js"></script> <script src="arc_optin_focus_manager.js"></script>
<script src="controlled_indicator.js"></script>
<script src="progressbar.js"></script> <script src="progressbar.js"></script>
</head> </head>
<body> <body>
......
chrome/browser/resources/component_extension_resources.grd
View file @ 713f1583
...@@ -74,6 +74,8 @@ ...@@ -74,6 +74,8 @@
<include name="IDR_WALLPAPER_MANAGER_MAIN_JS" file="chromeos/wallpaper_manager/js/main_scripts.js" flattenhtml="true" type="BINDATA" /> <include name="IDR_WALLPAPER_MANAGER_MAIN_JS" file="chromeos/wallpaper_manager/js/main_scripts.js" flattenhtml="true" type="BINDATA" />
<include name="IDR_WALLPAPER_MANAGER_UTIL_JS" file="chromeos/wallpaper_manager/js/util.js" type="BINDATA" /> <include name="IDR_WALLPAPER_MANAGER_UTIL_JS" file="chromeos/wallpaper_manager/js/util.js" type="BINDATA" />
<include name="IDR_ARC_SUPPORT_BACKGROUND_JS" file="chromeos/arc_support/background.js" type="BINDATA" /> <include name="IDR_ARC_SUPPORT_BACKGROUND_JS" file="chromeos/arc_support/background.js" type="BINDATA" />
<include name="IDR_ARC_SUPPORT_CONTROLLED_INDICATOR_JS" file="chromeos/arc_support/controlled_indicator.js" type="BINDATA" />
<include name="IDR_ARC_SUPPORT_CONTROLLED_INDICATOR_CSS" file="chromeos/arc_support/controlled_indicator.css" flattenhtml="true" type="chrome_html" />
<include name="IDR_ARC_SUPPORT_MAIN_CSS" file="chromeos/arc_support/main.css" type="BINDATA" /> <include name="IDR_ARC_SUPPORT_MAIN_CSS" file="chromeos/arc_support/main.css" type="BINDATA" />
<include name="IDR_ARC_SUPPORT_MAIN_JS" file="chromeos/arc_support/main.js" type="BINDATA" /> <include name="IDR_ARC_SUPPORT_MAIN_JS" file="chromeos/arc_support/main.js" type="BINDATA" />
<include name="IDR_ARC_SUPPORT_OVERLAY_CSS" file="chromeos/arc_support/overlay.css" type="BINDATA" /> <include name="IDR_ARC_SUPPORT_OVERLAY_CSS" file="chromeos/arc_support/overlay.css" type="BINDATA" />
......
ui/webui/resources/js/cr/ui/BUILD.gn
View file @ 713f1583
...@@ -42,7 +42,6 @@ preprocess_if_expr("preprocess_src") { ...@@ -42,7 +42,6 @@ preprocess_if_expr("preprocess_src") {
"card_slider.js", "card_slider.js",
"command.js", "command.js",
"context_menu_handler.js", "context_menu_handler.js",
"controlled_indicator.js",
"dialogs.js", "dialogs.js",
"drag_wrapper.js", "drag_wrapper.js",
"focus_grid.js", "focus_grid.js",
......
ui/webui/resources/webui_resources.grd
View file @ 713f1583
...@@ -80,8 +80,6 @@ without changes to the corresponding grd file. --> ...@@ -80,8 +80,6 @@ without changes to the corresponding grd file. -->
</if> </if>
</includes> </includes>
<structures> <structures>
<structure name="IDR_WEBUI_CSS_CONTROLLED_INDICATOR_CSS"
file="css/controlled_indicator.css" type="chrome_html" flattenhtml="true" />
<structure name="IDR_WEBUI_CSS_MENU_CSS" <structure name="IDR_WEBUI_CSS_MENU_CSS"
file="css/menu.css" type="chrome_html" file="css/menu.css" type="chrome_html"
flattenhtml="true" /> flattenhtml="true" />
......
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