2017-07-06 22:39:37 +02:00
|
|
|
diff --git content/app/content_service_manager_main_delegate.h content/app/content_service_manager_main_delegate.h
|
2018-06-01 21:16:26 +02:00
|
|
|
index a6ab54a14bc9..93a38abe55d2 100644
|
2017-07-06 22:39:37 +02:00
|
|
|
--- content/app/content_service_manager_main_delegate.h
|
|
|
|
+++ content/app/content_service_manager_main_delegate.h
|
2018-06-01 21:16:26 +02:00
|
|
|
@@ -18,7 +18,8 @@ namespace content {
|
2017-07-06 22:39:37 +02:00
|
|
|
|
2018-06-01 21:16:26 +02:00
|
|
|
class ContentMainRunnerImpl;
|
2017-07-06 22:39:37 +02:00
|
|
|
|
|
|
|
-class ContentServiceManagerMainDelegate : public service_manager::MainDelegate {
|
|
|
|
+class CONTENT_EXPORT ContentServiceManagerMainDelegate :
|
|
|
|
+ public service_manager::MainDelegate {
|
|
|
|
public:
|
|
|
|
explicit ContentServiceManagerMainDelegate(const ContentMainParams& params);
|
|
|
|
~ContentServiceManagerMainDelegate() override;
|
2018-04-19 17:44:42 +02:00
|
|
|
diff --git third_party/blink/renderer/controller/BUILD.gn third_party/blink/renderer/controller/BUILD.gn
|
2018-06-01 21:16:26 +02:00
|
|
|
index 20d1994e156e..45102558569f 100644
|
2018-04-19 17:44:42 +02:00
|
|
|
--- third_party/blink/renderer/controller/BUILD.gn
|
|
|
|
+++ third_party/blink/renderer/controller/BUILD.gn
|
2017-12-27 19:20:12 +01:00
|
|
|
@@ -25,6 +25,7 @@ component("controller") {
|
2017-07-06 22:39:37 +02:00
|
|
|
|
2017-12-27 19:20:12 +01:00
|
|
|
configs += [
|
|
|
|
"//build/config/compiler:wexit_time_destructors",
|
|
|
|
+ "//cef/libcef/features:config",
|
2018-04-19 17:44:42 +02:00
|
|
|
"//third_party/blink/renderer:config",
|
|
|
|
"//third_party/blink/renderer:inside_blink",
|
|
|
|
"//third_party/blink/renderer:non_test_config",
|
2018-06-01 21:16:26 +02:00
|
|
|
@@ -43,6 +44,8 @@ component("controller") {
|
|
|
|
"controller_export.h",
|
|
|
|
"dev_tools_frontend_impl.cc",
|
2018-04-19 17:44:42 +02:00
|
|
|
"dev_tools_frontend_impl.h",
|
|
|
|
+ "//cef/libcef/renderer/blink_glue.cc",
|
|
|
|
+ "//cef/libcef/renderer/blink_glue.h",
|
2017-12-27 19:20:12 +01:00
|
|
|
]
|
|
|
|
|
2018-06-01 21:16:26 +02:00
|
|
|
if (is_android) {
|