Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2557)

Unified Diff: content/shell/shell_webpreferences.cc

Issue 11565036: [content shell] use WebTestRunner::WebPreferences for layout tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698