Index: content/shell/shell_webpreferences.cc |
diff --git a/content/shell/shell_webpreferences.cc b/content/shell/shell_webpreferences.cc |
index 34185312dea10c321cb10b44687ecb28f2e58e44..0df2a58be78e2eb85dd57e986745c87c177c5410 100644 |
--- a/content/shell/shell_webpreferences.cc |
+++ b/content/shell/shell_webpreferences.cc |
@@ -8,24 +8,15 @@ |
namespace content { |
-ShellWebPreferences::ShellWebPreferences() |
- : allow_universal_access_from_file_urls(true), |
- dom_paste_enabled(true), |
- javascript_can_access_clipboard(true), |
- xss_auditor_enabled(true) { |
-} |
- |
-ShellWebPreferences::~ShellWebPreferences() {} |
- |
-void ShellWebPreferences::Apply(webkit_glue::WebPreferences* prefs) const { |
+void ShellWebPreferences::Export(webkit_glue::WebPreferences* prefs) const { |
prefs->allow_universal_access_from_file_urls = |
- allow_universal_access_from_file_urls; |
- prefs->dom_paste_enabled = dom_paste_enabled; |
- prefs->javascript_can_access_clipboard = javascript_can_access_clipboard; |
- prefs->xss_auditor_enabled = xss_auditor_enabled; |
-#if !defined(OS_MACOSX) |
- prefs->editing_behavior = webkit_glue::WebPreferences::EDITING_BEHAVIOR_WIN; |
-#endif |
+ allowUniversalAccessFromFileURLs; |
+ prefs->dom_paste_enabled = DOMPasteAllowed; |
+ prefs->javascript_can_access_clipboard = javaScriptCanAccessClipboard; |
+ prefs->xss_auditor_enabled = XSSAuditorEnabled; |
+ prefs->editing_behavior = |
+ static_cast<webkit_glue::WebPreferences::EditingBehavior>( |
+ editingBehavior); |
} |
} // namespace content |