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

Side by Side Diff: content/worker/websharedworker_stub.h

Issue 9188046: Revert 116954 - Pass Content-security-policy and header type from WebSharedWorkerProxy to WebShar... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 11 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/renderer/websharedworker_proxy.cc ('k') | content/worker/websharedworker_stub.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_WORKER_WEBSHAREDWORKER_STUB_H_ 5 #ifndef CONTENT_WORKER_WEBSHAREDWORKER_STUB_H_
6 #define CONTENT_WORKER_WEBSHAREDWORKER_STUB_H_ 6 #define CONTENT_WORKER_WEBSHAREDWORKER_STUB_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "content/worker/websharedworkerclient_proxy.h" 10 #include "content/worker/websharedworkerclient_proxy.h"
11 #include "content/worker/worker_webapplicationcachehost_impl.h" 11 #include "content/worker/worker_webapplicationcachehost_impl.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 44
45 // Returns the script url of this worker. 45 // Returns the script url of this worker.
46 const GURL& url(); 46 const GURL& url();
47 47
48 48
49 private: 49 private:
50 virtual ~WebSharedWorkerStub(); 50 virtual ~WebSharedWorkerStub();
51 51
52 void OnConnect(int sent_message_port_id, int routing_id); 52 void OnConnect(int sent_message_port_id, int routing_id);
53 void OnStartWorkerContext( 53 void OnStartWorkerContext(
54 const GURL& url, const string16& user_agent, const string16& source_code, 54 const GURL& url, const string16& user_agent, const string16& source_code);
55 const string16& content_security_policy, bool report_only);
56
57 void OnTerminateWorkerContext(); 55 void OnTerminateWorkerContext();
58 56
59 int route_id_; 57 int route_id_;
60 WorkerAppCacheInitInfo appcache_init_info_; 58 WorkerAppCacheInitInfo appcache_init_info_;
61 59
62 // WebSharedWorkerClient that responds to outgoing API calls 60 // WebSharedWorkerClient that responds to outgoing API calls
63 // from the worker object. 61 // from the worker object.
64 WebSharedWorkerClientProxy client_; 62 WebSharedWorkerClientProxy client_;
65 63
66 WebKit::WebSharedWorker* impl_; 64 WebKit::WebSharedWorker* impl_;
67 string16 name_; 65 string16 name_;
68 bool started_; 66 bool started_;
69 GURL url_; 67 GURL url_;
70 scoped_ptr<SharedWorkerDevToolsAgent> worker_devtools_agent_; 68 scoped_ptr<SharedWorkerDevToolsAgent> worker_devtools_agent_;
71 69
72 typedef std::pair<int, int> PendingConnectInfo; 70 typedef std::pair<int, int> PendingConnectInfo;
73 typedef std::vector<PendingConnectInfo> PendingConnectInfoList; 71 typedef std::vector<PendingConnectInfo> PendingConnectInfoList;
74 PendingConnectInfoList pending_connects_; 72 PendingConnectInfoList pending_connects_;
75 73
76 DISALLOW_COPY_AND_ASSIGN(WebSharedWorkerStub); 74 DISALLOW_COPY_AND_ASSIGN(WebSharedWorkerStub);
77 }; 75 };
78 76
79 #endif // CONTENT_WORKER_WEBSHAREDWORKER_STUB_H_ 77 #endif // CONTENT_WORKER_WEBSHAREDWORKER_STUB_H_
OLDNEW
« no previous file with comments | « content/renderer/websharedworker_proxy.cc ('k') | content/worker/websharedworker_stub.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698