diff options
| author | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-12 20:55:38 +0000 |
|---|---|---|
| committer | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-12 20:55:38 +0000 |
| commit | ac0fdb30ccff125add97db11b0d83f07713d5e0b (patch) | |
| tree | dcfe574201029af2d0a2697ea5db84e26ff78bd8 /content/worker/websharedworker_stub.cc | |
| parent | 9e7572846ad7a0c34cf57a64fdc255c87b417b29 (diff) | |
| download | chromium_src-ac0fdb30ccff125add97db11b0d83f07713d5e0b.zip chromium_src-ac0fdb30ccff125add97db11b0d83f07713d5e0b.tar.gz chromium_src-ac0fdb30ccff125add97db11b0d83f07713d5e0b.tar.bz2 | |
Revert 116954 - Pass Content-security-policy and header type from WebSharedWorkerProxy to WebSharedWorkerStub. WebKit side has changed, and need to start from scratch to avoid conflicts on rolls.
BUG=105482
Review URL: http://codereview.chromium.org/9154003
TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/9188046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/worker/websharedworker_stub.cc')
| -rw-r--r-- | content/worker/websharedworker_stub.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/content/worker/websharedworker_stub.cc b/content/worker/websharedworker_stub.cc index 69fa613..8b29305 100644 --- a/content/worker/websharedworker_stub.cc +++ b/content/worker/websharedworker_stub.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -81,14 +81,12 @@ const GURL& WebSharedWorkerStub::url() { } void WebSharedWorkerStub::OnStartWorkerContext( - const GURL& url, const string16& user_agent, const string16& source_code, - const string16& /* content_security_policy */, bool /* report_only */) { + const GURL& url, const string16& user_agent, const string16& source_code) { // Ignore multiple attempts to start this worker (can happen if two pages // try to start it simultaneously). if (started_) return; - // TODO(tsepez): pass CSP info into worker once webkit interface updated. impl_->startWorkerContext(url, name_, user_agent, source_code, 0); started_ = true; url_ = url; |