summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorinferno@chromium.org <inferno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-04 00:19:17 +0000
committerinferno@chromium.org <inferno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-04 00:19:17 +0000
commit98b5bcbd5136888ee6a6d63b5e2d69c85865a86a (patch)
tree73a0d17e5c40c5a4f4d7e3a1d319a0f735e81180 /chrome/browser
parentbde9617672d03e32e98dfe5f5aa17d3bd568dd54 (diff)
downloadchromium_src-98b5bcbd5136888ee6a6d63b5e2d69c85865a86a.zip
chromium_src-98b5bcbd5136888ee6a6d63b5e2d69c85865a86a.tar.gz
chromium_src-98b5bcbd5136888ee6a6d63b5e2d69c85865a86a.tar.bz2
Update Webkit 58626:58719. Make use of new setting for disabling clipboard access, already added in webkit as part of fix - https://bugs.webkit.org/show_bug.cgi?id=27751. Enable the setting in Test framework. Also, provide a command-line switch for this setting.
BUG=41654 TEST=None Review URL: http://codereview.chromium.org/1815005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46299 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/tab_contents/render_view_host_delegate_helper.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
index 5fe2208..219cca6 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -177,6 +177,8 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
command_line.HasSwitch(switches::kEnableFastback);
web_prefs.remote_fonts_enabled =
!command_line.HasSwitch(switches::kDisableRemoteFonts);
+ web_prefs.javascript_can_access_clipboard =
+ command_line.HasSwitch(switches::kJavaScriptCanAccessClipboard);
web_prefs.xss_auditor_enabled =
command_line.HasSwitch(switches::kEnableXSSAuditor);
web_prefs.application_cache_enabled =