summaryrefslogtreecommitdiffstats
path: root/content/shell
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2016-03-24 17:41:11 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-25 00:42:55 +0000
commitf510be61306f5e4986eceb1f8686bfcc934cd400 (patch)
tree934d72ba4133b7c5d8dff2b0cf8f6400750851df /content/shell
parentbafc20f876b6a70a5bee326eb388f6a057143112 (diff)
downloadchromium_src-f510be61306f5e4986eceb1f8686bfcc934cd400.zip
chromium_src-f510be61306f5e4986eceb1f8686bfcc934cd400.tar.gz
chromium_src-f510be61306f5e4986eceb1f8686bfcc934cd400.tar.bz2
Content "gn check" work.
Make content/gpu and content/plugin pass GN check. Makes most of content/shell and content/test pass check. These are not all enabled yet pending a few remaining issues that are more difficult to solve. The private content targets now allow content/test to include headers from them for non-component builds. Checking is disabled for content/test in component builds as described in the comment at the top of //content/BUILD.gn Renames the ui/events/ipc according to GN style BUG= CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel TBR=jschuh (IPC build tweak) Review URL: https://codereview.chromium.org/1828483002 Cr-Commit-Position: refs/heads/master@{#383208}
Diffstat (limited to 'content/shell')
-rw-r--r--content/shell/BUILD.gn14
1 files changed, 12 insertions, 2 deletions
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index 6ce50f8..865931d 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -221,12 +221,14 @@ static_library("content_shell_lib") {
"//content/app/strings",
"//content/gpu",
"//content/test:layouttest_support",
+ "//content/test:test_support",
"//device/bluetooth",
"//device/bluetooth:mocks",
"//gin",
"//gpu",
"//ipc",
"//media",
+ "//media/mojo/services:application_factory",
"//net",
"//net:net_resources",
"//skia",
@@ -255,6 +257,7 @@ static_library("content_shell_lib") {
"//content/ppapi_plugin",
"//ppapi:blink_deprecated_test_plugin",
"//ppapi:blink_test_plugin",
+ "//ppapi/shared_impl",
]
}
if (mojo_media_host == "browser") {
@@ -270,7 +273,10 @@ static_library("content_shell_lib") {
}
if (is_linux) {
- deps += [ "//build/linux:fontconfig" ]
+ deps += [
+ "//build/linux:fontconfig",
+ "//ui/gfx:test_support",
+ ]
}
if (use_x11) {
@@ -289,7 +295,10 @@ static_library("content_shell_lib") {
}
if (is_posix && !is_mac) {
- deps += [ "//components/crash/content/browser" ]
+ deps += [
+ "//components/crash/content/app",
+ "//components/crash/content/browser",
+ ]
}
if (use_aura) {
@@ -308,6 +317,7 @@ static_library("content_shell_lib") {
"//ui/views",
"//ui/views:test_support",
"//ui/views/controls/webview",
+ "//ui/wm:test_support",
]
} else {
sources += [ "browser/shell_aura.cc" ]