Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(854)

Unified Diff: ui/base/BUILD.gn

Issue 854713003: More old files deletion. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Fix tryjobs? Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/base/BUILD.gn
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index fb7ea898ca60dd0f6781efd4a1a5a639ea2abe54..a5d83db1b1eea4416258d796d0754ca2558bc1af 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -9,10 +9,6 @@ if (is_android) {
import("//build/config/android/rules.gni")
}
-declare_args() {
- ui_base_build_ime = true
-}
-
component("base") {
output_name = "ui_base"
sources = [
@@ -25,50 +21,8 @@ component("base") {
"android/window_android.h",
"android/window_android_compositor.h",
"android/window_android_observer.h",
- "cursor/cursor.cc",
"cursor/cursor.h",
- "cursor/cursor_android.cc",
- "cursor/cursor_loader.h",
- "cursor/cursor_util.cc",
- "cursor/cursor_util.h",
- "cursor/cursor_win.cc",
"hit_test.h",
- "l10n/formatter.cc",
- "l10n/formatter.h",
- "l10n/l10n_font_util.cc",
- "l10n/l10n_font_util.h",
- "l10n/l10n_util.cc",
- "l10n/l10n_util.h",
- "l10n/l10n_util_android.cc",
- "l10n/l10n_util_android.h",
- "l10n/l10n_util_collator.h",
- "l10n/l10n_util_mac.h",
- "l10n/l10n_util_mac.mm",
- "l10n/l10n_util_plurals.cc",
- "l10n/l10n_util_plurals.h",
- "l10n/l10n_util_posix.cc",
- "l10n/l10n_util_win.cc",
- "l10n/l10n_util_win.h",
- "l10n/time_format.cc",
- "l10n/time_format.h",
- "layout.cc",
- "layout.h",
- "layout_mac.mm",
- "resource/data_pack.cc",
- "resource/data_pack.h",
- "resource/resource_bundle.cc",
- "resource/resource_bundle.h",
- "resource/resource_bundle_android.cc",
- "resource/resource_bundle_auralinux.cc",
- "resource/resource_bundle_ios.mm",
- "resource/resource_bundle_mac.mm",
- "resource/resource_bundle_win.cc",
- "resource/resource_bundle_win.h",
- "resource/resource_data_dll_win.cc",
- "resource/resource_data_dll_win.h",
- "resource/resource_handle.h",
- "text/bytes_formatting.cc",
- "text/bytes_formatting.h",
"touch/touch_device.h",
"touch/touch_enabled.cc",
"touch/touch_enabled.h",
@@ -87,8 +41,6 @@ component("base") {
"win/accessibility_misc_utils.cc",
"win/accessibility_misc_utils.h",
"win/atl_module.h",
- "win/dpi_setup.cc",
- "win/dpi_setup.h",
"win/foreground_helper.cc",
"win/foreground_helper.h",
"win/hidden_window.cc",
@@ -119,8 +71,8 @@ component("base") {
sources += [ "touch/touch_device_win.cc" ]
} else if (is_android) {
sources += [ "touch/touch_device_android.cc" ]
- } else if (use_aura && use_x11) {
- sources += [ "touch/touch_device_aurax11.cc" ]
+ } else if (use_x11) {
+ sources += [ "touch/touch_device_x11.cc" ]
} else {
# Empty implementation for all other cases.
sources += [ "touch/touch_device.cc" ]
@@ -131,6 +83,7 @@ component("base") {
public_deps = [
"//base",
"//skia",
+ "//ui/events",
"//ui/events/platform",
"//ui/events:events_base",
"//ui/gfx",
@@ -142,19 +95,9 @@ component("base") {
"//base:i18n",
"//net",
"//third_party/icu",
- "//ui/resources",
- "//ui/strings",
"//url",
]
- if (use_aura) {
- deps += [ "//ui/events" ]
- } else {
- sources -= [
- "cursor/cursor.cc",
- "cursor/cursor.h",
- ]
- }
if (use_x11) {
sources += [
"x/x11_foreign_window_manager.cc",
@@ -168,10 +111,6 @@ component("base") {
deps += [ "//ui/gfx/x" ]
}
- if (!use_aura || !is_linux) {
- sources -= [ "resource/resource_bundle_auralinux.cc" ]
- }
-
if (is_linux) {
configs += [
"//build/config/linux:fontconfig",
@@ -181,10 +120,6 @@ component("base") {
libs = []
if (is_win) {
- sources += [
- "cursor/cursor_loader_win.cc",
- "cursor/cursor_loader_win.h",
- ]
cflags = [
"/wd4267", # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int.
"/wd4324", # Structure was padded due to __declspec(align()), which is
@@ -230,19 +165,8 @@ component("base") {
configs += [ "//build/config/linux:x11" ]
}
- if (use_x11) {
- sources += [
- "cursor/cursor_loader_x11.cc",
- "cursor/cursor_loader_x11.h",
- "cursor/cursor_x11.cc",
- ]
- }
-
if (is_android) {
- sources -= [
- "l10n/l10n_font_util.cc",
- "ui_base_types.cc",
- ]
+ sources -= [ "ui_base_types.cc" ]
deps += [ ":ui_base_jni_headers" ]
@@ -255,18 +179,12 @@ component("base") {
#"//ui/android:ui_java",
]
}
-
- if (is_android && !use_aura) {
- sources -= [ "cursor/cursor_android.cc" ]
- }
}
if (is_android) {
generate_jni("ui_base_jni_headers") {
sources = [
"../android/java/src/org/chromium/ui/base/DeviceFormFactor.java",
- "../android/java/src/org/chromium/ui/base/LocalizationUtils.java",
- "../android/java/src/org/chromium/ui/base/ResourceBundle.java",
"../android/java/src/org/chromium/ui/base/SelectFileDialog.java",
"../android/java/src/org/chromium/ui/base/TouchDevice.java",
"../android/java/src/org/chromium/ui/base/ViewAndroid.java",
@@ -288,26 +206,14 @@ if (false) {
# GYP version: ui/base/ui_base_tests.gyp:ui_unittests
test("ui_unittests") {
sources = [
- "l10n/l10n_util_mac_unittest.mm",
- "l10n/l10n_util_unittest.cc",
- "l10n/l10n_util_win_unittest.cc",
- "l10n/time_format_unittest.cc",
"layout_unittest.cc",
- "models/tree_node_iterator_unittest.cc",
- "resource/data_pack_literal.cc",
- "resource/data_pack_unittest.cc",
- "resource/resource_bundle_unittest.cc",
"test/run_all_unittests.cc",
]
sources += [
"accelerators/accelerator_manager_unittest.cc",
"accelerators/menu_label_accelerator_util_linux_unittest.cc",
- "models/list_model_unittest.cc",
- "models/list_selection_model_unittest.cc",
- "models/tree_node_model_unittest.cc",
"test/data/resource.h",
- "text/bytes_formatting_unittest.cc",
"view_prop_unittest.cc",
]
@@ -324,9 +230,6 @@ if (false) {
"//ui/events:events_base",
"//ui/events:test_support",
"//ui/gfx:test_support",
- "//ui/resources",
- "//ui/resources:ui_test_pak",
- "//ui/strings",
"//url",
]
@@ -362,8 +265,6 @@ if (false) {
}
if (use_x11) {
- sources += [ "cursor/cursor_loader_x11_unittest.cc" ]
-
configs += [ "//build/config/linux:x11" ]
deps += [
@@ -376,7 +277,7 @@ if (false) {
]
}
- if (!is_win || !use_aura) {
+ if (!is_win) {
sources -= [ "view_prop_unittest.cc" ]
}
« no previous file with comments | « ui/android/java/src/org/chromium/ui/base/ResourceBundle.java ('k') | ui/base/android/ui_base_jni_registrar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698