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

Unified Diff: ui/views/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/message_center/BUILD.gn ('k') | ui/views/controls/webview/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/BUILD.gn
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
index c311fbd969cdf5a3f0916571555c2b659b0fa3f5..032eac723716a5f155ecfab0e76332c3c556c32a 100644
--- a/ui/views/BUILD.gn
+++ b/ui/views/BUILD.gn
@@ -17,15 +17,23 @@ component("views") {
defines = [ "VIEWS_IMPLEMENTATION" ]
deps = [
- "//base",
"//base:i18n",
"//base/third_party/dynamic_annotations",
"//skia",
"//third_party/icu",
"//third_party/wtl",
"//ui/accessibility",
- "//ui/accessibility:ax_gen",
"//ui/aura",
+ "//ui/native_theme",
+ "//ui/resources",
+ "//ui/strings",
+ "//ui/wm",
+ "//url",
+ ]
+
+ public_deps = [
+ "//base",
+ "//ui/accessibility:ax_gen",
"//ui/base",
"//ui/compositor",
"//ui/events",
@@ -33,15 +41,8 @@ component("views") {
"//ui/events/platform",
"//ui/gfx",
"//ui/gfx/geometry",
- "//ui/native_theme",
- "//ui/resources",
- "//ui/strings",
- "//ui/wm",
- "//url",
]
- forward_dependent_configs_from = [ "//ui/accessibility:ax_gen" ]
-
if (use_x11 && !is_chromeos) {
deps += [ "//ui/display/util" ]
}
@@ -85,6 +86,7 @@ component("views") {
]
deps += [
"//ui/events/platform/x11",
+ "//ui/gfx/x",
]
}
@@ -107,8 +109,10 @@ static_library("test_support") {
testonly = true
sources = gypi_values.views_test_support_sources
- deps = [
+ public_deps = [
":views",
+ ]
+ deps = [
"//base",
"//ipc:test_support",
"//skia",
@@ -136,6 +140,9 @@ static_library("test_support") {
sources += gypi_values.views_test_support_aura_sources
deps += [ "//ui/aura:test_support" ]
}
+ if (use_x11) {
+ deps += [ "//ui/gfx/x" ]
+ }
}
test("views_unittests") {
@@ -143,7 +150,6 @@ test("views_unittests") {
deps = [
":test_support",
- ":views",
"//base",
"//base:i18n",
"//base/allocator",
@@ -155,13 +161,15 @@ test("views_unittests") {
"//ui/aura",
"//ui/base",
"//ui/base:test_support",
- "//ui/compositor",
- "//ui/events",
+ "//ui/compositor:test_support",
+ "//ui/events:test_support",
"//ui/events:events_base",
"//ui/events/platform",
"//ui/gfx",
"//ui/gfx/geometry",
"//ui/gl",
+ "//ui/resources",
+ "//ui/strings",
"//ui/wm",
"//url",
]
@@ -199,6 +207,7 @@ test("views_unittests") {
]
deps += [
"//ui/events/platform/x11",
+ "//ui/gfx/x",
]
}
@@ -210,7 +219,10 @@ test("views_unittests") {
}
}
if (use_x11) {
- deps += [ "//ui/events/platform/x11" ]
+ deps += [
+ "//ui/events/platform/x11",
+ "//ui/gfx/x",
+ ]
}
if (is_mac) {
« no previous file with comments | « ui/message_center/BUILD.gn ('k') | ui/views/controls/webview/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698