patch for "Move content::WebPreferences struct to Blink"

rogerwang · rogerwang · commit 01e769bda8ce · 2020-09-11T07:33:03.000-06:00
diff --git a/src/browser/nw_content_browser_hooks.cc b/src/browser/nw_content_browser_hooks.cc
@@ -17,7 +17,6 @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/renderer/v8_value_converter.h"
-#include "content/public/common/web_preferences.h"
 #include "content/public/browser/child_process_termination_info.h"
 
 // content/nw
@@ -155,7 +154,7 @@ CONTENT_EXPORT void OSXOpenURLsHook(const std::vector<GURL>& startup_urls) {
 }
 #endif
 
-void OverrideWebkitPrefsHook(content::RenderViewHost* rvh, content::WebPreferences* web_prefs) {
+void OverrideWebkitPrefsHook(content::RenderViewHost* rvh, blink::web_pref::WebPreferences* web_prefs) {
   nw::Package* package = nw::package();
   if (!package)
     return;
diff --git a/src/browser/nw_content_browser_hooks.h b/src/browser/nw_content_browser_hooks.h
@@ -2,6 +2,7 @@
 #define NW_CONTENT_BROWSER_HOOKS_H_
 
 #include "content/common/content_export.h"
+#include "third_party/blink/public/common/web_preferences/web_preferences.h"
 
 class GURL;
 
@@ -43,7 +44,7 @@ CONTENT_EXPORT void RendererProcessTerminatedHook(content::RenderProcessHost* pr
 bool ProcessSingletonNotificationCallbackHook(const base::CommandLine& command_line,
                                              const base::FilePath& current_directory);
 // ref in chrome/browser/chrome_content_browser_client.cc
-CONTENT_EXPORT void OverrideWebkitPrefsHook(content::RenderViewHost* rvh, content::WebPreferences* web_prefs);
+CONTENT_EXPORT void OverrideWebkitPrefsHook(content::RenderViewHost* rvh, blink::web_pref::WebPreferences* web_prefs);
 // ref in chrome/browser/chrome_content_browser_client.cc
 // content/browser/renderer_host/render_process_host_impl.cc
 // content/browser/site_instance_impl.cc
diff --git a/src/nw_content.h b/src/nw_content.h
@@ -10,7 +10,7 @@
 #include "nw_package.h"
 #include "base/memory/ptr_util.h"
 #include "third_party/blink/public/web/web_navigation_policy.h"
-//#include "third_party/WebKit/common/page/page_visibility_state.mojom.h"
+#include "third_party/blink/public/common/web_preferences/web_preferences.h"
 
 namespace base {
   class DictionaryValue;
@@ -97,7 +97,7 @@ void DocumentFinishHook(blink::WebLocalFrame* frame,
  void ReloadExtensionHook(const extensions::Extension*);
  bool IsReloadingApp();
  void KickNextTick();
- void OverrideWebkitPrefsHook(content::RenderViewHost* rvh, content::WebPreferences* web_prefs);
+ void OverrideWebkitPrefsHook(content::RenderViewHost* rvh, blink::web_pref::WebPreferences* web_prefs);
  bool PinningRenderer();
  void SetPinningRenderer(bool pin);
  void ShowDevtools(bool show, content::WebContents* web_contents, content::WebContents* container = nullptr);
