Commit b111d60d authored by Henrique Ferreiro's avatar Henrique Ferreiro Committed by Commit Bot

Rename //ui/base/cursor:cursor to :cursor_base

This is a precursor CL before moving the rest of the ui/base/cursor/
files to the target //ui/base/cursor:cursor.

Bug: 1085358
Change-Id: I46811aa42d8ed5688ff10fd24b3dbaab8531c259
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2211781Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Henrique Ferreiro <hferreiro@igalia.com>
Cr-Commit-Position: refs/heads/master@{#771055}
parent 143dd10d
...@@ -1494,7 +1494,7 @@ component("ash") { ...@@ -1494,7 +1494,7 @@ component("ash") {
"//services/media_session/public/mojom", "//services/media_session/public/mojom",
"//skia", "//skia",
"//ui/aura", "//ui/aura",
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/base/cursor/mojom:cursor_type", "//ui/base/cursor/mojom:cursor_type",
"//ui/events", "//ui/events",
"//ui/gfx", "//ui/gfx",
...@@ -2257,7 +2257,7 @@ test("ash_unittests") { ...@@ -2257,7 +2257,7 @@ test("ash_unittests") {
"//ui/aura:test_support", "//ui/aura:test_support",
"//ui/base", "//ui/base",
"//ui/base:test_support", "//ui/base:test_support",
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/base/cursor/mojom:cursor_type", "//ui/base/cursor/mojom:cursor_type",
"//ui/base/ime", "//ui/base/ime",
"//ui/base/ime/chromeos", "//ui/base/ime/chromeos",
......
...@@ -97,7 +97,7 @@ source_set("exo") { ...@@ -97,7 +97,7 @@ source_set("exo") {
] ]
public_deps = [ public_deps = [
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/base/cursor/mojom:cursor_type", "//ui/base/cursor/mojom:cursor_type",
] ]
......
...@@ -19,7 +19,7 @@ static_library("renderer") { ...@@ -19,7 +19,7 @@ static_library("renderer") {
] ]
} }
public_deps = [ "//ui/base/cursor" ] public_deps = [ "//ui/base/cursor:cursor_base" ]
deps = [ deps = [
"//content/public/child", "//content/public/child",
......
...@@ -220,7 +220,7 @@ jumbo_source_set("browser") { ...@@ -220,7 +220,7 @@ jumbo_source_set("browser") {
"//ui/base:buildflags", "//ui/base:buildflags",
"//ui/base:data_exchange", "//ui/base:data_exchange",
"//ui/base/clipboard", "//ui/base/clipboard",
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/base/cursor/mojom:cursor_type", "//ui/base/cursor/mojom:cursor_type",
"//ui/base/idle", "//ui/base/idle",
"//ui/base/ime/init", "//ui/base/ime/init",
......
...@@ -228,7 +228,7 @@ source_set("common") { ...@@ -228,7 +228,7 @@ source_set("common") {
"//third_party/blink/public/common", "//third_party/blink/public/common",
"//ui/accessibility", "//ui/accessibility",
"//ui/accessibility/mojom", "//ui/accessibility/mojom",
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/base/cursor/mojom:cursor_type", "//ui/base/cursor/mojom:cursor_type",
"//ui/events/ipc", "//ui/events/ipc",
] ]
...@@ -641,7 +641,7 @@ mojom("mojo_bindings") { ...@@ -641,7 +641,7 @@ mojom("mojo_bindings") {
"//services/network/public/cpp", "//services/network/public/cpp",
"//third_party/blink/public/common", "//third_party/blink/public/common",
"//ui/accessibility", "//ui/accessibility",
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/base/ime:text_input_types", "//ui/base/ime:text_input_types",
"//ui/events/blink", "//ui/events/blink",
"//ui/gfx/ipc", "//ui/gfx/ipc",
......
...@@ -239,7 +239,7 @@ jumbo_source_set("common_sources") { ...@@ -239,7 +239,7 @@ jumbo_source_set("common_sources") {
"//third_party/icu", "//third_party/icu",
"//ui/accessibility", "//ui/accessibility",
"//ui/base", "//ui/base",
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/gfx", "//ui/gfx",
"//ui/gfx/ipc", "//ui/gfx/ipc",
"//ui/gfx/ipc/color", "//ui/gfx/ipc/color",
......
...@@ -406,7 +406,7 @@ target(link_target_type, "renderer") { ...@@ -406,7 +406,7 @@ target(link_target_type, "renderer") {
"//ui/accessibility", "//ui/accessibility",
"//ui/base", "//ui/base",
"//ui/base/clipboard", "//ui/base/clipboard",
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/base/ime", "//ui/base/ime",
"//ui/display", "//ui/display",
"//ui/events:dom_keycode_converter", "//ui/events:dom_keycode_converter",
...@@ -642,7 +642,7 @@ target(link_target_type, "renderer") { ...@@ -642,7 +642,7 @@ target(link_target_type, "renderer") {
"//printing/mojom", "//printing/mojom",
"//third_party/libvpx", "//third_party/libvpx",
"//third_party/opus", "//third_party/opus",
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/base/cursor/mojom:cursor_type", "//ui/base/cursor/mojom:cursor_type",
] ]
} }
......
...@@ -29,7 +29,7 @@ source_set("chromeos") { ...@@ -29,7 +29,7 @@ source_set("chromeos") {
"//skia", "//skia",
"//third_party/webrtc_overrides:webrtc_component", "//third_party/webrtc_overrides:webrtc_component",
"//ui/aura", "//ui/aura",
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/compositor", "//ui/compositor",
"//ui/events", "//ui/events",
"//ui/views", "//ui/views",
......
...@@ -430,7 +430,7 @@ source_set("blink_headers") { ...@@ -430,7 +430,7 @@ source_set("blink_headers") {
"//skia", "//skia",
"//third_party/blink/public/common", "//third_party/blink/public/common",
"//ui/accessibility:ax_base", "//ui/accessibility:ax_base",
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/base/ime:text_input_types", "//ui/base/ime:text_input_types",
"//ui/base/ime/mojom", "//ui/base/ime/mojom",
"//url", "//url",
......
...@@ -247,7 +247,7 @@ jumbo_source_set("testing") { ...@@ -247,7 +247,7 @@ jumbo_source_set("testing") {
":core", ":core",
":generated_testing_idls", ":generated_testing_idls",
"//third_party/blink/renderer/bindings/core/v8:testing", "//third_party/blink/renderer/bindings/core/v8:testing",
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/base/cursor/mojom:cursor_type_blink", "//ui/base/cursor/mojom:cursor_type_blink",
] ]
...@@ -1487,7 +1487,7 @@ jumbo_source_set("unit_tests") { ...@@ -1487,7 +1487,7 @@ jumbo_source_set("unit_tests") {
"//third_party/blink/renderer/core/editing:unit_tests", "//third_party/blink/renderer/core/editing:unit_tests",
"//third_party/blink/renderer/core/fileapi:unit_tests", "//third_party/blink/renderer/core/fileapi:unit_tests",
"//third_party/blink/renderer/core/html:unit_tests", "//third_party/blink/renderer/core/html:unit_tests",
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/base/cursor/mojom:cursor_type_blink", "//ui/base/cursor/mojom:cursor_type_blink",
] ]
......
...@@ -86,7 +86,7 @@ blink_core_sources("exported") { ...@@ -86,7 +86,7 @@ blink_core_sources("exported") {
} }
deps = [ deps = [
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/base/cursor/mojom:cursor_type_blink", "//ui/base/cursor/mojom:cursor_type_blink",
] ]
......
...@@ -218,7 +218,7 @@ blink_core_sources("frame") { ...@@ -218,7 +218,7 @@ blink_core_sources("frame") {
deps = [ deps = [
"//skia", "//skia",
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/base/cursor/mojom:cursor_type_blink", "//ui/base/cursor/mojom:cursor_type_blink",
] ]
} }
...@@ -38,7 +38,7 @@ blink_core_sources("input") { ...@@ -38,7 +38,7 @@ blink_core_sources("input") {
"touch_list.h", "touch_list.h",
] ]
public_deps = [ "//ui/base/cursor" ] public_deps = [ "//ui/base/cursor:cursor_base" ]
deps = [ deps = [
"//skia", "//skia",
......
...@@ -116,5 +116,5 @@ blink_core_sources("page") { ...@@ -116,5 +116,5 @@ blink_core_sources("page") {
"viewport_description.h", "viewport_description.h",
] ]
public_deps = [ "//ui/base/cursor" ] public_deps = [ "//ui/base/cursor:cursor_base" ]
} }
...@@ -1597,7 +1597,7 @@ jumbo_component("platform") { ...@@ -1597,7 +1597,7 @@ jumbo_component("platform") {
"//third_party/one_euro_filter", "//third_party/one_euro_filter",
"//third_party/webrtc_overrides:webrtc_component", "//third_party/webrtc_overrides:webrtc_component",
"//third_party/zlib/google:compression_utils", "//third_party/zlib/google:compression_utils",
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/base/cursor/mojom:cursor_type_blink", "//ui/base/cursor/mojom:cursor_type_blink",
"//ui/events/ipc", "//ui/events/ipc",
"//ui/gfx/geometry", "//ui/gfx/geometry",
......
...@@ -66,7 +66,7 @@ component("android") { ...@@ -66,7 +66,7 @@ component("android") {
"//skia", "//skia",
"//third_party/blink/public:blink_headers", "//third_party/blink/public:blink_headers",
"//ui/base", "//ui/base",
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/base/cursor/mojom:cursor_type", "//ui/base/cursor/mojom:cursor_type",
"//ui/compositor", "//ui/compositor",
"//ui/display", "//ui/display",
......
...@@ -134,7 +134,7 @@ jumbo_component("aura") { ...@@ -134,7 +134,7 @@ jumbo_component("aura") {
] ]
public_deps = [ public_deps = [
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/base/ime", "//ui/base/ime",
"//ui/compositor", "//ui/compositor",
] ]
...@@ -225,7 +225,7 @@ jumbo_static_library("test_support") { ...@@ -225,7 +225,7 @@ jumbo_static_library("test_support") {
"//skia", "//skia",
"//testing/gtest", "//testing/gtest",
"//ui/base:test_support", "//ui/base:test_support",
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/base/cursor/mojom:cursor_type", "//ui/base/cursor/mojom:cursor_type",
"//ui/base/ime/init", "//ui/base/ime/init",
"//ui/compositor:test_support", "//ui/compositor:test_support",
......
...@@ -434,7 +434,7 @@ jumbo_component("base") { ...@@ -434,7 +434,7 @@ jumbo_component("base") {
":ui_data_pack", ":ui_data_pack",
"//base", "//base",
"//skia", "//skia",
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/base/cursor/mojom:cursor_type", "//ui/base/cursor/mojom:cursor_type",
"//ui/gfx", "//ui/gfx",
"//ui/gfx/geometry", "//ui/gfx/geometry",
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
import("//build/config/ui.gni") import("//build/config/ui.gni")
component("cursor") { component("cursor_base") {
output_name = "ui_base_cursor" output_name = "ui_base_cursor_base"
sources = [ sources = [
"cursor.cc", "cursor.cc",
...@@ -13,7 +13,7 @@ component("cursor") { ...@@ -13,7 +13,7 @@ component("cursor") {
"cursor_size.h", "cursor_size.h",
] ]
defines = [ "IS_UI_BASE_CURSOR_IMPL" ] defines = [ "IS_UI_BASE_CURSOR_BASE_IMPL" ]
public_deps = [ public_deps = [
"//base", "//base",
......
...@@ -28,7 +28,7 @@ typedef void* PlatformCursor; ...@@ -28,7 +28,7 @@ typedef void* PlatformCursor;
#endif #endif
// Ref-counted cursor that supports both default and custom cursors. // Ref-counted cursor that supports both default and custom cursors.
class COMPONENT_EXPORT(UI_BASE_CURSOR) Cursor { class COMPONENT_EXPORT(UI_BASE_CURSOR_BASE) Cursor {
public: public:
Cursor(); Cursor();
......
...@@ -33,7 +33,7 @@ source_set("mojom_traits") { ...@@ -33,7 +33,7 @@ source_set("mojom_traits") {
] ]
public_deps = [ public_deps = [
":mojom_shared", ":mojom_shared",
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
] ]
deps = [ deps = [
"//skia", "//skia",
...@@ -56,7 +56,7 @@ source_set("unittests") { ...@@ -56,7 +56,7 @@ source_set("unittests") {
":mojom_traits", ":mojom_traits",
"//testing/gtest", "//testing/gtest",
"//ui/base", "//ui/base",
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/gfx:geometry_skia", "//ui/gfx:geometry_skia",
"//ui/gfx/geometry/mojom:mojom_traits", "//ui/gfx/geometry/mojom:mojom_traits",
] ]
......
...@@ -129,7 +129,7 @@ jumbo_component("ozone_base") { ...@@ -129,7 +129,7 @@ jumbo_component("ozone_base") {
# Everyone should depend on //ui/ozone instead except a handful of # Everyone should depend on //ui/ozone instead except a handful of
# things that would otherwise create a cycle. # things that would otherwise create a cycle.
"//ui/base", "//ui/base",
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/events/ozone/*", "//ui/events/ozone/*",
"//ui/ozone/common/*", "//ui/ozone/common/*",
"//ui/ozone/public/mojom", "//ui/ozone/public/mojom",
......
...@@ -16,6 +16,8 @@ component("platform_window") { ...@@ -16,6 +16,8 @@ component("platform_window") {
defines = [ "IS_PLATFORM_WINDOW_IMPL" ] defines = [ "IS_PLATFORM_WINDOW_IMPL" ]
public_deps = [ "//ui/base/cursor:cursor_base" ]
deps = [ deps = [
"//base", "//base",
"//ui/base", "//ui/base",
...@@ -28,7 +30,7 @@ component("platform_window") { ...@@ -28,7 +30,7 @@ component("platform_window") {
"fuchsia/initialize_presenter_api_view.h", "fuchsia/initialize_presenter_api_view.h",
] ]
public_deps = [ public_deps += [
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.policy", "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.policy",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.views", "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.views",
"//third_party/fuchsia-sdk/sdk/pkg/scenic_cpp", "//third_party/fuchsia-sdk/sdk/pkg/scenic_cpp",
......
...@@ -502,7 +502,7 @@ jumbo_component("views") { ...@@ -502,7 +502,7 @@ jumbo_component("views") {
"//ui/accessibility:ax_enums_mojo", "//ui/accessibility:ax_enums_mojo",
"//ui/base", "//ui/base",
"//ui/base/clipboard", "//ui/base/clipboard",
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/base/ime/init", "//ui/base/ime/init",
"//ui/compositor", "//ui/compositor",
"//ui/display", "//ui/display",
......
...@@ -69,7 +69,7 @@ jumbo_component("wm") { ...@@ -69,7 +69,7 @@ jumbo_component("wm") {
"//skia", "//skia",
"//ui/aura", "//ui/aura",
"//ui/base", "//ui/base",
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/base/cursor/mojom:cursor_type", "//ui/base/cursor/mojom:cursor_type",
"//ui/base/ime", "//ui/base/ime",
"//ui/compositor", "//ui/compositor",
...@@ -103,7 +103,7 @@ jumbo_static_library("test_support") { ...@@ -103,7 +103,7 @@ jumbo_static_library("test_support") {
"test/wm_test_helper.h", "test/wm_test_helper.h",
] ]
public_deps = [ "//ui/base/cursor" ] public_deps = [ "//ui/base/cursor:cursor_base" ]
deps = [ deps = [
":wm", ":wm",
...@@ -144,7 +144,7 @@ test("wm_unittests") { ...@@ -144,7 +144,7 @@ test("wm_unittests") {
"//testing/gtest", "//testing/gtest",
"//ui/aura:test_support", "//ui/aura:test_support",
"//ui/base:test_support", "//ui/base:test_support",
"//ui/base/cursor", "//ui/base/cursor:cursor_base",
"//ui/base/cursor/mojom:cursor_type", "//ui/base/cursor/mojom:cursor_type",
"//ui/base/ime", "//ui/base/ime",
"//ui/compositor:test_support", "//ui/compositor:test_support",
......
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