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
|
2017-12-07 22:44:24 +01:00
|
|
|
index 4393a8fac233..860715e86900 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
|
|
|
|
|
@@ -16,7 +16,8 @@ namespace content {
|
|
|
|
|
|
|
|
|
|
class ContentMainRunner;
|
|
|
|
|
|
|
|
|
|
-class ContentServiceManagerMainDelegate : public service_manager::MainDelegate {
|
|
|
|
|
+class CONTENT_EXPORT ContentServiceManagerMainDelegate :
|
|
|
|
|
+ public service_manager::MainDelegate {
|
|
|
|
|
public:
|
|
|
|
|
explicit ContentServiceManagerMainDelegate(const ContentMainParams& params);
|
|
|
|
|
~ContentServiceManagerMainDelegate() override;
|
2017-09-06 23:40:58 +02:00
|
|
|
diff --git third_party/WebKit/Source/controller/BUILD.gn third_party/WebKit/Source/controller/BUILD.gn
|
2017-12-27 19:20:12 +01:00
|
|
|
index 714113da5d67..2a8feb621f4b 100644
|
2017-09-06 23:40:58 +02:00
|
|
|
--- third_party/WebKit/Source/controller/BUILD.gn
|
|
|
|
|
+++ third_party/WebKit/Source/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",
|
|
|
|
|
"//third_party/WebKit/Source:config",
|
|
|
|
|
"//third_party/WebKit/Source:inside_blink",
|
|
|
|
|
"//third_party/WebKit/Source:non_test_config",
|
|
|
|
|
@@ -39,6 +40,8 @@ component("controller") {
|
|
|
|
|
"ControllerExport.h",
|
|
|
|
|
"OomInterventionImpl.cpp",
|
|
|
|
|
"OomInterventionImpl.h",
|
|
|
|
|
+ "//cef/libcef/renderer/webkit_glue.cc",
|
|
|
|
|
+ "//cef/libcef/renderer/webkit_glue.h",
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
if (is_mac) {
|
