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

Unified Diff: ui/base/BUILD.gn

Issue 584683002: Improve GN header checker, make //ui pass. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 6 years, 3 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
« no previous file with comments | « ui/aura/BUILD.gn ('k') | ui/compositor/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/BUILD.gn
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index 2ac985fa1b97d4dfc9c062d5134527ead7fde3f4..0436bec3a2df2aac38e5aee21380289a7d9c9b13 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -261,13 +261,6 @@ component("base") {
"window_open_disposition.cc",
"window_open_disposition.h",
"work_area_watcher_observer.h",
- "x/x11_foreign_window_manager.cc",
- "x/x11_foreign_window_manager.h",
- "x/x11_menu_list.cc",
- "x/x11_menu_list.h",
- "x/x11_util.cc",
- "x/x11_util.h",
- "x/x11_util_internal.h",
]
if (is_win) {
@@ -285,26 +278,24 @@ component("base") {
defines = [ "UI_BASE_IMPLEMENTATION" ]
- deps = [
+ public_deps = [
"//base",
- "//base/third_party/dynamic_annotations",
- "//base:base_static",
- "//base:i18n",
- "//net",
"//skia",
- "//third_party/icu",
"//ui/events/platform",
"//ui/events:events_base",
"//ui/gfx",
"//ui/gfx/geometry",
+ ]
+ deps = [
+ "//base/third_party/dynamic_annotations",
+ "//base:base_static",
+ "//base:i18n",
+ "//net",
+ "//third_party/icu",
"//ui/resources",
"//ui/strings",
"//url",
]
- # We expose these things in our headers:
- forward_dependent_configs_from = [
- "//ui/gfx",
- ]
if (build_ime) {
if (!is_android) {
@@ -446,8 +437,8 @@ component("base") {
"dragdrop/drag_utils_aura.cc",
]
}
- if (!use_x11) {
- sources -= [
+ if (use_x11) {
+ sources += [
"x/x11_foreign_window_manager.cc",
"x/x11_foreign_window_manager.h",
"x/x11_menu_list.cc",
@@ -456,6 +447,7 @@ component("base") {
"x/x11_util.h",
"x/x11_util_internal.h",
]
+ deps += [ "//ui/gfx/x" ]
}
if (!use_aura || !is_linux) {
@@ -666,8 +658,10 @@ source_set("test_support") {
"test/ui_controls_win.cc",
]
- deps = [
+ public_deps = [
":base",
+ ]
+ deps = [
"//base",
"//skia",
"//testing/gtest",
« no previous file with comments | « ui/aura/BUILD.gn ('k') | ui/compositor/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698