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

Unified Diff: chrome/browser/worker_host/worker_service.h

Issue 441022: Changed shared worker code so incognito windows do not have access to non-incognito shared workers. (Closed)
Patch Set: Removed superfluous valgrind change. Created 11 years, 1 month 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: chrome/browser/worker_host/worker_service.h
diff --git a/chrome/browser/worker_host/worker_service.h b/chrome/browser/worker_host/worker_service.h
index 0de41210948add7fefcbcbc2a64cdd7187e51e0e..5db6eee24b7a6c2b972ea29a818a8b4bc5787bba 100644
--- a/chrome/browser/worker_host/worker_service.h
+++ b/chrome/browser/worker_host/worker_service.h
@@ -28,6 +28,7 @@ class WorkerService : public NotificationObserver {
// Creates a dedicated worker. Returns true on success.
bool CreateWorker(const GURL &url,
bool is_shared,
+ bool is_off_the_record,
const string16& name,
int renderer_pid,
int render_view_route_id,
@@ -40,6 +41,7 @@ class WorkerService : public NotificationObserver {
// existing shared worker with the same name.
bool LookupSharedWorker(const GURL &url,
const string16& name,
+ bool off_the_record,
unsigned long long document_id,
IPC::Message::Sender* sender,
int sender_route_id,
@@ -67,7 +69,7 @@ class WorkerService : public NotificationObserver {
int worker_process_id);
WorkerProcessHost::WorkerInstance* FindSharedWorkerInstance(
- const GURL& url, const string16& name);
+ const GURL& url, const string16& name, bool off_the_record);
// Used when multiple workers can run in the same process.
static const int kMaxWorkerProcessesWhenSharing;
@@ -112,10 +114,11 @@ class WorkerService : public NotificationObserver {
// APIs for manipulating our set of pending shared worker instances.
WorkerProcessHost::WorkerInstance* CreatePendingInstance(
- const GURL& url, const string16& name);
+ const GURL& url, const string16& name, bool off_the_record);
WorkerProcessHost::WorkerInstance* FindPendingInstance(
- const GURL& url, const string16& name);
- void RemovePendingInstance(const GURL& url, const string16& name);
+ const GURL& url, const string16& name, bool off_the_record);
+ void RemovePendingInstance(
+ const GURL& url, const string16& name, bool off_the_record);
NotificationRegistrar registrar_;
int next_worker_route_id_;

Powered by Google App Engine
This is Rietveld 408576698