summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authoratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-05 23:31:38 +0000
committeratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-05 23:31:38 +0000
commitce6564de3870a55541b8c71b635eb8b3ff20f313 (patch)
tree7b3d859970f1d3878873ded09b982f09a698cbb9 /chrome/renderer
parent1e0e74b3fb524d65666cddebe723db855021a706 (diff)
downloadchromium_src-ce6564de3870a55541b8c71b635eb8b3ff20f313.zip
chromium_src-ce6564de3870a55541b8c71b635eb8b3ff20f313.tar.gz
chromium_src-ce6564de3870a55541b8c71b635eb8b3ff20f313.tar.bz2
Added support for --enable-shared-workers
Added a --enable-shared-workers flag, and return false from SharedWorkerRepository::isAvailable() if it is not set. BUG=26233 TEST=None (unit tests do not run yet) Review URL: http://codereview.chromium.org/372004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31162 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/renderer_webkitclient_impl.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index 612277b..d671a3f 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -368,7 +368,12 @@ long long RendererWebKitClientImpl::databaseGetFileSize(
WebKit::WebSharedWorkerRepository*
RendererWebKitClientImpl::sharedWorkerRepository() {
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableSharedWorkers)) {
return &shared_worker_repository_;
+ } else {
+ return NULL;
+ }
}
//------------------------------------------------------------------------------