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

Unified Diff: blimp/client/BUILD.gn

Issue 1929723002: [Blimp] Adds blimp engine browser test framework and LoadUrl test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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: blimp/client/BUILD.gn
diff --git a/blimp/client/BUILD.gn b/blimp/client/BUILD.gn
index 889bd97fa0ec21f8bac2f7858826568288d48eae..d425fa516ad75df704c54a0f9bc95dbcb7fa8d74 100644
--- a/blimp/client/BUILD.gn
+++ b/blimp/client/BUILD.gn
@@ -9,18 +9,45 @@ if (is_android) {
import("//build/config/android/rules.gni")
}
-source_set("blimp_client") {
+source_set("session") {
+ sources = [
+ "session/assignment_source.cc",
+ "session/assignment_source.h",
+ "session/blimp_client_session.cc",
+ "session/blimp_client_session.h",
+ ]
+
+ public_deps = [
+ "//components/safe_json",
+ "//ui/events",
+ ]
+
+ deps = [
+ ":feature",
+ ":switches",
+ "//base",
+ "//blimp/common:blimp_common",
+ "//blimp/common/proto",
+ "//blimp/net:blimp_net",
+ "//net",
+ "//ui/gfx/geometry",
+ "//url:url",
+ ]
+}
+
+source_set("switches") {
sources = [
"app/blimp_client_switches.cc",
"app/blimp_client_switches.h",
+ ]
+}
+
+source_set("blimp_client") {
nyquist 2016/04/29 21:30:54 Just "client" nowadays :-) Also, with that I think
haibinlu 2016/04/29 22:43:13 Done.
+ sources = [
"app/blimp_discardable_memory_allocator.cc",
"app/blimp_discardable_memory_allocator.h",
"app/blimp_startup.cc",
"app/blimp_startup.h",
- "session/assignment_source.cc",
- "session/assignment_source.h",
- "session/blimp_client_session.cc",
- "session/blimp_client_session.h",
]
public_deps = [
@@ -30,7 +57,10 @@ source_set("blimp_client") {
]
deps = [
+ ":compositor",
":feature",
+ ":session",
+ ":switches",
"//base",
"//blimp/common:blimp_common",
"//blimp/common/proto",
@@ -53,6 +83,8 @@ source_set("blimp_client_unit_tests") {
deps = [
":blimp_client",
+ ":session",
+ ":switches",
"//base",
"//base/test:run_all_unittests",
"//base/test:test_support",
@@ -94,6 +126,38 @@ source_set("app_unit_tests") {
source_set("feature") {
sources = [
+ "feature/ime_feature.cc",
+ "feature/ime_feature.h",
+ "feature/navigation_feature.cc",
+ "feature/navigation_feature.h",
+ "feature/render_widget_feature.cc",
+ "feature/render_widget_feature.h",
+ "feature/settings_feature.cc",
+ "feature/settings_feature.h",
+ "feature/tab_control_feature.cc",
+ "feature/tab_control_feature.h",
+ ]
+
+ deps = [
+ "//base:base",
+ "//blimp/common:blimp_common",
+ "//blimp/net:blimp_net",
+ "//cc",
+ "//cc/proto",
+ "//components/url_formatter",
+ "//net:net",
+ "//skia",
+ "//ui/base/ime:text_input_types",
+ "//ui/gfx/geometry:geometry",
+ ]
+
+ public_deps = [
+ "//blimp/common/proto",
+ ]
+}
+
+source_set("compositor") {
nyquist 2016/04/29 21:30:53 should this be feature_compositor?
haibinlu 2016/04/29 22:43:13 Done.
+ sources = [
"feature/compositor/blimp_compositor.cc",
"feature/compositor/blimp_compositor.h",
"feature/compositor/blimp_compositor_manager.cc",
@@ -112,24 +176,14 @@ source_set("feature") {
"feature/compositor/blimp_output_surface.h",
"feature/compositor/decoding_image_generator.cc",
"feature/compositor/decoding_image_generator.h",
- "feature/ime_feature.cc",
- "feature/ime_feature.h",
- "feature/navigation_feature.cc",
- "feature/navigation_feature.h",
- "feature/render_widget_feature.cc",
- "feature/render_widget_feature.h",
- "feature/settings_feature.cc",
- "feature/settings_feature.h",
- "feature/tab_control_feature.cc",
- "feature/tab_control_feature.h",
]
deps = [
+ ":feature",
"//blimp/common:blimp_common",
"//blimp/net:blimp_net",
"//cc",
"//cc/proto",
- "//components/url_formatter",
"//gpu/command_buffer/client",
"//gpu/command_buffer/client:gl_in_process_context",
"//gpu/command_buffer/client:gles2_c_lib",
@@ -139,7 +193,6 @@ source_set("feature") {
"//net",
"//skia",
"//third_party/WebKit/public:blink_headers",
- "//ui/base/ime:text_input_types",
"//ui/events:gesture_detection",
"//ui/events/blink",
"//ui/events/gestures/blink",
@@ -162,6 +215,7 @@ source_set("feature_unit_tests") {
]
deps = [
+ ":compositor",
":feature",
"//base",
"//base/test:run_all_unittests",
@@ -198,6 +252,7 @@ if (is_linux && !is_chromeos && use_x11) {
deps = [
":blimp_client",
+ ":compositor",
":feature",
"//base",
"//blimp/net:blimp_net",
@@ -370,6 +425,7 @@ if (is_android) {
shared_library("blimp_client_android") {
deps = [
":blimp_client",
+ ":compositor",
":feature",
":jni_headers",
"//base",

Powered by Google App Engine
This is Rietveld 408576698