Commit 90c9b6c4 authored by Robert Liao's avatar Robert Liao Committed by Commit Bot

Remove USE_COLOR_PIPELINE and Associated Build Support

USE_COLOR_PIPELINE is no longer referenced.

BUG=1057239
TBR=sky@chromium.org
Flag removal.

Change-Id: I843d41bee9152dd0bb464e22ffcf5e1bd8f03375
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2088674
Commit-Queue: Robert Liao <robliao@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: default avatarPeter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747065}
parent a38f0691
...@@ -2259,7 +2259,6 @@ jumbo_static_library("browser") { ...@@ -2259,7 +2259,6 @@ jumbo_static_library("browser") {
"//ui/base:ui_data_pack", "//ui/base:ui_data_pack",
"//ui/base/idle", "//ui/base/idle",
"//ui/base/ime", "//ui/base/ime",
"//ui/color:color_buildflags",
"//ui/events:events_base", "//ui/events:events_base",
"//ui/gfx", "//ui/gfx",
"//ui/gfx/geometry", "//ui/gfx/geometry",
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include "extensions/common/extension.h" #include "extensions/common/extension.h"
#include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkColor.h"
#include "ui/base/layout.h" #include "ui/base/layout.h"
#include "ui/color/color_buildflags.h"
#include "ui/gfx/color_utils.h" #include "ui/gfx/color_utils.h"
namespace base { namespace base {
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include "chrome/grit/theme_resources.h" #include "chrome/grit/theme_resources.h"
#include "content/public/test/browser_task_environment.h" #include "content/public/test/browser_task_environment.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "ui/color/color_buildflags.h"
#include "ui/color/color_mixer.h" #include "ui/color/color_mixer.h"
#include "ui/color/color_provider.h" #include "ui/color/color_provider.h"
#include "ui/color/color_test_ids.h" #include "ui/color/color_test_ids.h"
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
#ifndef CHROME_BROWSER_UI_COLOR_CHROME_COLOR_ID_H_ #ifndef CHROME_BROWSER_UI_COLOR_CHROME_COLOR_ID_H_
#define CHROME_BROWSER_UI_COLOR_CHROME_COLOR_ID_H_ #define CHROME_BROWSER_UI_COLOR_CHROME_COLOR_ID_H_
#include "ui/color/color_buildflags.h"
#include "ui/color/color_id.h" #include "ui/color/color_id.h"
// TODO(pkasting): Add the rest of the colors. // TODO(pkasting): Add the rest of the colors.
......
...@@ -13,11 +13,6 @@ declare_args() { ...@@ -13,11 +13,6 @@ declare_args() {
# Whether the message center should be included for displaying notifications. # Whether the message center should be included for displaying notifications.
enable_message_center = is_win || is_mac || is_linux enable_message_center = is_win || is_mac || is_linux
# Whether to compute UI colors with the color pipeline framework,
# instead of NativeTheme/ThemeService.
# TODO(http://crbug.com/1057239): Remove this flag.
use_color_pipeline = true
} }
enable_hidpi = is_mac || is_win || is_linux || is_ios enable_hidpi = is_mac || is_win || is_linux || is_ios
...@@ -7,12 +7,6 @@ import("//build/config/jumbo.gni") ...@@ -7,12 +7,6 @@ import("//build/config/jumbo.gni")
import("//testing/test.gni") import("//testing/test.gni")
import("//ui/base/ui_features.gni") import("//ui/base/ui_features.gni")
buildflag_header("color_buildflags") {
header = "color_buildflags.h"
flags = [ "USE_COLOR_PIPELINE=$use_color_pipeline" ]
}
source_set("color_headers") { source_set("color_headers") {
sources = [ sources = [
"color_id.h", "color_id.h",
...@@ -23,7 +17,6 @@ source_set("color_headers") { ...@@ -23,7 +17,6 @@ source_set("color_headers") {
] ]
public_deps = [ public_deps = [
":color_buildflags",
"//base:base", "//base:base",
"//skia:skia", "//skia:skia",
] ]
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
#include "build/build_config.h" #include "build/build_config.h"
#include "build/buildflag.h" #include "build/buildflag.h"
#include "ui/color/color_buildflags.h"
// clang-format off // clang-format off
#define CROSS_PLATFORM_COLOR_IDS \ #define CROSS_PLATFORM_COLOR_IDS \
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include "base/component_export.h" #include "base/component_export.h"
#include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkColor.h"
#include "ui/color/color_buildflags.h"
#include "ui/color/color_id.h" #include "ui/color/color_id.h"
#include "ui/color/color_mixer.h" #include "ui/color/color_mixer.h"
......
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