Modify webkit preferences in content browser client.

zcbenz · zcbenz · commit 24dfcbc64033 · 2012-09-25T09:53:46.000+08:00
diff --git a/src/shell_content_browser_client.cc b/src/shell_content_browser_client.cc
@@ -34,6 +34,7 @@
 #include "content/nw/src/shell_browser_main_parts.h"
 #include "geolocation/shell_access_token_store.h"
 #include "googleurl/src/gurl.h"
+#include "webkit/glue/webpreferences.h"
 
 namespace content {
 
@@ -88,4 +89,20 @@ AccessTokenStore* ShellContentBrowserClient::CreateAccessTokenStore() {
   return new ShellAccessTokenStore(browser_context()->GetRequestContext());
 }
 
+void ShellContentBrowserClient::OverrideWebkitPrefs(
+      RenderViewHost* render_view_host,
+      const GURL& url,
+      webkit_glue::WebPreferences* prefs) {
+  // Disable web security
+  prefs->web_security_enabled = false;
+  prefs->allow_file_access_from_file_urls = true;
+
+  // Disable plugins to speed up (TODO provide flag to enable them)
+  prefs->plugins_enabled = false;
+  prefs->java_enabled = false;
+
+  // No caches
+  prefs->uses_page_cache = false;
+}
+
 }  // namespace content
diff --git a/src/shell_content_browser_client.h b/src/shell_content_browser_client.h
@@ -29,6 +29,10 @@ class ShellContentBrowserClient : public ContentBrowserClient {
   virtual void RenderProcessHostCreated(RenderProcessHost* host) OVERRIDE;
   virtual void ResourceDispatcherHostCreated() OVERRIDE;
   virtual AccessTokenStore* CreateAccessTokenStore() OVERRIDE;
+  virtual void OverrideWebkitPrefs(
+      RenderViewHost* render_view_host,
+      const GURL& url,
+      webkit_glue::WebPreferences* prefs) OVERRIDE;
   virtual std::string GetDefaultDownloadName() OVERRIDE;
   virtual MediaObserver* GetMediaObserver() OVERRIDE;
   virtual void BrowserURLHandlerCreated(BrowserURLHandler* handler) OVERRIDE;
diff --git a/src/shell_main_delegate.cc b/src/shell_main_delegate.cc
@@ -99,17 +99,12 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
   logging::LogEventProvider::Initialize(kContentShellProviderName);
 #endif
 
-  // Disable web security
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  command_line->AppendSwitch(switches::kAllowFileAccessFromFiles);
-  command_line->AppendSwitch(switches::kDisableWebSecurity);
-
   // Enforce single process
-  command_line->AppendSwitch(switches::kSingleProcess);
+  // command_line->AppendSwitch(switches::kSingleProcess);
 
   // Fix navigator.language in single process mode
   std::string locale = l10n_util::GetApplicationLocale("en-US");
-  command_line->AppendSwitchASCII(switches::kLang, locale);
+  CommandLine::ForCurrentProcess()->AppendSwitchASCII(switches::kLang, locale);
 
   InitLogging();
 
