Index: blimp/engine/BUILD.gn |
diff --git a/blimp/engine/BUILD.gn b/blimp/engine/BUILD.gn |
index c41a4ee3872207d1da3d15a8ea9182806630ebd3..81d032a182603c973d6beec98e5d81dc70e887e7 100644 |
--- a/blimp/engine/BUILD.gn |
+++ b/blimp/engine/BUILD.gn |
@@ -55,31 +55,24 @@ source_set("app") { |
"app/blimp_content_main_delegate.h", |
"app/blimp_content_renderer_client.cc", |
"app/blimp_content_renderer_client.h", |
- "app/blimp_engine_config.cc", |
- "app/blimp_engine_config.h", |
- "app/blimp_network_delegate.cc", |
- "app/blimp_network_delegate.h", |
- "app/blimp_permission_manager.cc", |
- "app/blimp_permission_manager.h", |
- "app/blimp_system_url_request_context_getter.cc", |
- "app/blimp_system_url_request_context_getter.h", |
- "app/blimp_url_request_context_getter.cc", |
- "app/blimp_url_request_context_getter.h", |
- "app/engine_settings.h", |
- "app/settings_manager.cc", |
- "app/settings_manager.h", |
- "app/switches.cc", |
- "app/switches.h", |
] |
deps = [ |
+ ":app_config", |
+ ":app_net", |
+ ":app_permissions", |
+ ":app_settings", |
+ ":app_switches", |
":app_ui", |
":blob_channel", |
":common", |
":renderer", |
":session", |
"//base", |
+ "//blimp/common:blimp_common", |
"//blimp/common/proto", |
+ "//blimp/engine:blob_channel_mojo_cpp_sources", |
+ "//blimp/net:blimp_net", |
"//components/web_cache/renderer", |
"//content", |
"//content/public/app:both", |
@@ -87,6 +80,66 @@ source_set("app") { |
"//content/public/common", |
"//content/public/renderer", |
"//content/public/utility", |
+ "//net", |
+ ] |
+} |
+ |
+source_set("app_config") { |
+ sources = [ |
+ "app/blimp_engine_config.cc", |
+ "app/blimp_engine_config.h", |
+ ] |
+ deps = [ |
+ ":app_switches", |
+ "//base", |
+ ] |
+} |
+ |
+source_set("app_net") { |
+ sources = [ |
+ "app/blimp_network_delegate.cc", |
+ "app/blimp_network_delegate.h", |
+ "app/blimp_system_url_request_context_getter.cc", |
+ "app/blimp_system_url_request_context_getter.h", |
+ "app/blimp_url_request_context_getter.cc", |
+ "app/blimp_url_request_context_getter.h", |
+ ] |
+ deps = [ |
+ ":common_user_agent", |
+ "//base", |
+ "//content/public/browser", |
+ "//net", |
+ ] |
+} |
+ |
+source_set("app_permissions") { |
+ sources = [ |
+ "app/blimp_permission_manager.cc", |
+ "app/blimp_permission_manager.h", |
+ ] |
+ deps = [ |
+ "//base", |
+ "//content/public/browser", |
+ ] |
+} |
+ |
+source_set("app_settings") { |
+ sources = [ |
+ "app/engine_settings.h", |
+ "app/settings_manager.cc", |
+ "app/settings_manager.h", |
+ ] |
+ deps = [ |
+ "//blimp/net:blimp_net", |
+ "//content/public/browser", |
+ "//content/public/common", |
+ ] |
+} |
+ |
+source_set("app_switches") { |
+ sources = [ |
+ "app/switches.cc", |
+ "app/switches.h", |
] |
} |
@@ -125,13 +178,28 @@ source_set("common") { |
] |
deps = [ |
+ ":app_net", |
+ ":app_permissions", |
+ ":common_user_agent", |
"//base", |
- "//components/version_info", |
+ "//content/public/browser", |
"//content/public/common", |
+ "//net", |
"//ui/base", |
] |
} |
+source_set("common_user_agent") { |
+ sources = [ |
+ "common/blimp_user_agent.cc", |
+ "common/blimp_user_agent.h", |
+ ] |
+ deps = [ |
+ "//components/version_info", |
+ "//content/public/common", |
+ ] |
+} |
+ |
source_set("feature") { |
sources = [ |
"feature/engine_render_widget_feature.cc", |
@@ -142,7 +210,14 @@ source_set("feature") { |
deps = [ |
"//base", |
+ "//blimp/common:blimp_common", |
"//blimp/common/proto", |
+ "//blimp/engine:app_settings", |
+ "//blimp/engine:common", |
+ "//blimp/net:blimp_net", |
+ "//content/public/browser", |
+ "//content/public/common", |
+ "//net", |
"//ui/base", |
"//ui/base/ime", |
"//ui/resources", |
@@ -162,6 +237,7 @@ source_set("renderer") { |
"//blimp/common:blimp_common", |
"//blimp/common/proto", |
"//cc", |
+ "//content/public/renderer", |
"//skia", |
"//third_party/libwebp", |
"//ui/gfx/geometry", |
@@ -176,6 +252,11 @@ source_set("session") { |
] |
deps = [ |
+ ":app_config", |
+ ":app_settings", |
+ ":app_switches", |
+ ":app_ui", |
+ ":common", |
":feature", |
"//base", |
"//blimp/common:blimp_common", |
@@ -183,6 +264,9 @@ source_set("session") { |
"//blimp/net:blimp_net", |
"//content", |
"//net", |
+ "//ui/aura", |
+ "//ui/base/ime", |
+ "//ui/wm", |
] |
} |
@@ -214,9 +298,13 @@ source_set("app_unit_tests") { |
deps = [ |
":app", |
+ ":app_config", |
+ ":app_settings", |
+ ":app_switches", |
"//base", |
"//base/test:run_all_unittests", |
"//base/test:test_support", |
+ "//blimp/engine:app_ui", |
"//testing/gmock", |
"//testing/gtest", |
"//ui/gfx:test_support", |
@@ -236,10 +324,17 @@ source_set("feature_unit_tests") { |
"//base", |
"//base/test:run_all_unittests", |
"//base/test:test_support", |
+ "//blimp/common:blimp_common", |
"//blimp/common/proto", |
+ "//blimp/engine:app_settings", |
+ "//blimp/net:blimp_net", |
+ "//blimp/net:test_support", |
"//content", |
+ "//net", |
+ "//net:test_support", |
"//testing/gmock", |
"//testing/gtest", |
+ "//ui/base/ime", |
] |
} |
@@ -261,8 +356,9 @@ if (is_linux) { |
deps = [ |
":app", |
":pak", |
+ "//base", |
"//blimp/net:blimp_net", |
- "//content/public/app:both", |
+ "//content", |
Dirk Pranke
2016/04/26 01:21:44
Actually, thinking about this now, I might've gott
brettw
2016/04/26 04:59:40
I think there is some context that I'm missing. Bu
nyquist
2016/04/26 21:47:50
Updated https://codereview.chromium.org/1914933004
|
] |
} |