[cros_colors] Move cros_colors from ui/resources/css to ui/chromeos/colors

This CL moves the centralized style sheet to ui/chromeos/colors since it's being used for Views as well as WebUI. A new chrome://resources alias was added so the file can be accessed through chrome://resources/chromeos/colors/cros_colors.generated.css. Bug: 1018654 Change-Id: If7fb5c0aed3fa30746df32587e818a4f420ba49c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2306140Reviewed-by: James Cook <jamescook@chromium.org> Reviewed-by: Luciano Pacheco <lucmult@chromium.org> Reviewed-by: Kinuko Yasuda <kinuko@chromium.org> Reviewed-by: Giovanni Ortuño Urquidi <ortuno@chromium.org> Commit-Queue: calamity <calamity@chromium.org> Cr-Commit-Position: refs/heads/master@{#792186}

[cros_colors] Move cros_colors from ui/resources/css to ui/chromeos/colors
This CL moves the centralized style sheet to ui/chromeos/colors since it's being used for Views as well as WebUI. A new chrome://resources alias was added so the file can be accessed through chrome://resources/chromeos/colors/cros_colors.generated.css. Bug: 1018654 Change-Id: If7fb5c0aed3fa30746df32587e818a4f420ba49c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2306140Reviewed-by: James Cook <jamescook@chromium.org> Reviewed-by: Luciano Pacheco <lucmult@chromium.org> Reviewed-by: Kinuko Yasuda <kinuko@chromium.org> Reviewed-by: Giovanni Ortuño Urquidi <ortuno@chromium.org> Commit-Queue: calamity <calamity@chromium.org> Cr-Commit-Position: refs/heads/master@{#792186}
7191df2b · Christopher Lam · Commit Bot · 46f54a04 · 7191df2b · 7191df2b
Commit 7191df2b authored Jul 28, 2020 by Christopher Lam Committed by Commit Bot Jul 28, 2020
17 changed files
--- a/ash/BUILD.gn
+++ b/ash/BUILD.gn
@@ -1629,6 +1629,7 @@ component("ash") {
    "//ui/base/ime/chromeos",
    "//ui/base/ime/init",
    "//ui/chromeos",
+    "//ui/chromeos/colors:cros_colors_views",
    "//ui/chromeos/events",
    "//ui/chromeos/resources",
    "//ui/compositor",
@@ -1650,7 +1651,6 @@ component("ash") {
    "//ui/platform_window/stub",
    "//ui/snapshot",
    "//ui/views/window/vector_icons",
-    "//ui/webui/resources/css:cros_colors_views",
    "//ui/wm/public",
    "//url",
  ]

--- a/ash/style/ash_color_provider.cc
+++ b/ash/style/ash_color_provider.cc
@@ -13,6 +13,7 @@
 #include "base/command_line.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
+#include "ui/chromeos/colors/cros_colors.h"
 #include "ui/gfx/color_analysis.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
@@ -20,7 +21,6 @@
 #include "ui/views/background.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/label_button.h"
-#include "ui/webui/resources/css/cros_colors.h"
 namespace ash {

--- a/chrome/browser/resources/chromeos/crostini_upgrader/index.html
+++ b/chrome/browser/resources/chromeos/crostini_upgrader/index.html
@@ -8,7 +8,7 @@
    }
  </style>
  <link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css">
-  <link rel="stylesheet" href="chrome://resources/css/cros_colors.generated.css">
+  <link rel="stylesheet" href="chrome://resources/chromeos/colors/cros_colors.generated.css">
  <script type="module" src="app.js"></script>
 </head>
 <body>

--- a/chrome/browser/resources/chromeos/zip_archiver/html/passphrase-dialog.html
+++ b/chrome/browser/resources/chromeos/zip_archiver/html/passphrase-dialog.html
 <link rel="import" href="chrome://resources/html/polymer.html">
-<link rel="stylesheet" href="chrome://resources/css/cros_colors.generated.css">
+<link rel="stylesheet" href="chrome://resources/chromeos/colors/cros_colors.generated.css">
 <link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">

--- a/chrome/browser/resources/settings/chromeos/BUILD.gn
+++ b/chrome/browser/resources/settings/chromeos/BUILD.gn
@@ -36,7 +36,7 @@ if (optimize_webui) {
    ]
    excludes = [
      # TODO(calamity): Update optimize_webui to handle generated files.
-      "chrome://resources/css/cros_colors.generated.css",
+      "chrome://resources/chromeos/colors/cros_colors.generated.css",
      "chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom.html",
      "chrome://os-settings/app-management/app_management.mojom-lite.js",
      "chrome://os-settings/app-management/file_path.mojom-lite.js",
@@ -74,7 +74,7 @@ if (optimize_webui) {
      "chrome://resources/mojo/services/network/public/mojom/ip_address.mojom-lite.js",
      "chrome://resources/cr_components/chromeos/network/mojo_interface_provider.m.js",
      "chrome://resources/js/cr.m.js",
-      "chrome://resources/css/cros_colors.generated.css",
+      "chrome://resources/chromeos/colors/cros_colors.generated.css",
      "chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.js",
      "chrome://resources/mojo/url/mojom/url.mojom-lite.js",
      "app-management/app_management.mojom-lite.js",

--- a/chrome/browser/resources/settings/chromeos/os_settings.html
+++ b/chrome/browser/resources/settings/chromeos/os_settings.html
@@ -6,7 +6,7 @@
 <if expr="not optimize_webui">
  <base href="chrome://os-settings">
 </if>
-  <link rel="stylesheet" href="chrome://resources/css/cros_colors.generated.css">
+  <link rel="stylesheet" href="chrome://resources/chromeos/colors/cros_colors.generated.css">
  <style>
    html {
      background-color: var(--cros-bg-color);

--- a/chrome/browser/resources/settings/chromeos/os_settings_v3.html
+++ b/chrome/browser/resources/settings/chromeos/os_settings_v3.html
@@ -4,7 +4,7 @@
  <meta charset="utf-8">
  <title>$i18n{settings}</title>
  <base href="chrome://os-settings">
-  <link rel="stylesheet" href="chrome://resources/css/cros_colors.generated.css">
+  <link rel="stylesheet" href="chrome://resources/chromeos/colors/cros_colors.generated.css">
  <style>
    html {
      background-color: var(--cros-bg-color);

--- a/chromeos/components/print_management/resources/print_management_shared_css.html
+++ b/chromeos/components/print_management/resources/print_management_shared_css.html
 <link rel="stylesheet"
-    href="chrome://resources/css/cros_colors.generated.css">
+    href="chrome://resources/chromeos/colors/cros_colors.generated.css">
 <link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css">
 <link rel="stylesheet" href="chrome://resources/css/md_colors.css">
 <template>

--- a/content/browser/webui/shared_resources_data_source.cc
+++ b/content/browser/webui/shared_resources_data_source.cc
@@ -70,6 +70,9 @@ const std::map<std::string, std::string> CreatePathPrefixAliasesMap() {
    // more context: crbug.com/1020284.
    {"@out_folder@/android_clang_arm/gen/ui/webui/resources/", ""},
 #endif  // defined(OS_ANDROID)
+#if defined(OS_CHROMEOS)
+    {"@out_folder@/gen/ui/chromeos/", "chromeos/"},
+#endif  // defined(OS_CHROMEOS)
  };
 #if !defined(OS_ANDROID)

--- a/ui/webui/resources/css/BUILD.gn
+++ b/ui/webui/resources/css/BUILD.gn
-# Copyright 2020 The Chromium Authors.  All rights reserved.
+# Copyright 2020 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.

--- a/ui/chromeos/colors/OWNERS
+++ b/ui/chromeos/colors/OWNERS
+calamity@chromium.org
+# COMPONENT: UI
--- a/ui/webui/resources/css/cros_colors.json5
+++ b/ui/webui/resources/css/cros_colors.json5
--- a/ui/webui/resources/css/cros_palette.json5
+++ b/ui/webui/resources/css/cros_palette.json5
--- a/ui/file_manager/file_manager/main.html
+++ b/ui/file_manager/file_manager/main.html
@@ -14,7 +14,7 @@
    <link rel="import" href="chrome://resources/html/polymer.html">
    <link rel="stylesheet" href="chrome://resources/css/action_link.css">
    <link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
-    <link rel="stylesheet" href="chrome://resources/css/cros_colors.generated.css">
+    <link rel="stylesheet" href="chrome://resources/chromeos/colors/cros_colors.generated.css">
    <link rel="stylesheet" href="foreground/css/list.css">
    <link rel="stylesheet" href="foreground/css/table.css">
    <link rel="stylesheet" href="foreground/css/tree.css">

--- a/ui/file_manager/gallery/gallery.html
+++ b/ui/file_manager/gallery/gallery.html
@@ -8,7 +8,7 @@
  <script src="chrome://resources/polymer/v1_0/html-imports/html-imports.min.js"></script>
  <link rel="import" href="chrome://resources/html/polymer.html">
  <link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
-  <link rel="stylesheet" href="chrome://resources/css/cros_colors.generated.css">
+  <link rel="stylesheet" href="chrome://resources/chromeos/colors/cros_colors.generated.css">
  <link rel="stylesheet" href="../file_manager/foreground/css/list.css">
  <link rel="stylesheet" href="../file_manager/foreground/css/common.css">
  <link rel="stylesheet" href="../file_manager/foreground/css/file_types.css">

--- a/ui/resources/BUILD.gn
+++ b/ui/resources/BUILD.gn
@@ -41,7 +41,7 @@ grit("webui_resources_grd") {
  deps = [ "//ui/webui/resources:modulize" ]
  if (is_chromeos) {
-    deps += [ "//ui/webui/resources/css:cros_colors_css" ]
+    deps += [ "//ui/chromeos/colors:cros_colors_css" ]
  }
  outputs = [

--- a/ui/webui/resources/webui_resources.grd
+++ b/ui/webui/resources/webui_resources.grd
@@ -209,8 +209,9 @@ without changes to the corresponding grd file. -->
                 file="html/promise_resolver.html" type="chrome_html" />
      <if expr="chromeos">
-        <structure name="IDR_WEBUI_CSS_CROS_COLORS"
+        <structure name="IDR_WEBUI_CROS_COLORS_CSS"
-                   file="${root_gen_dir}/ui/webui/resources/css/cros_colors.generated.css" type="chrome_html"
+                   file="${root_gen_dir}/ui/chromeos/colors/cros_colors.generated.css"
+                   type="chrome_html"
                   use_base_dir="false" />
      </if>