Chromium Code Reviews

Side by Side Diff: chrome/browser/worker_host/worker_service.cc

Issue 5367006: Refactor: move HostContentSettingsMap to content_settings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase again Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | | Annotate | Revision Log
« no previous file with comments | « chrome/browser/worker_host/worker_process_host.cc ('k') | chrome/chrome_browser.gypi » ('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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 #include "chrome/browser/worker_host/worker_service.h" 5 #include "chrome/browser/worker_host/worker_service.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/singleton.h" 8 #include "base/singleton.h"
9 #include "base/sys_info.h" 9 #include "base/sys_info.h"
10 #include "base/thread.h" 10 #include "base/thread.h"
11 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/host_content_settings_map.h" 12 #include "chrome/browser/content_settings/host_content_settings_map.h"
13 #include "chrome/browser/plugin_service.h" 13 #include "chrome/browser/plugin_service.h"
14 #include "chrome/browser/renderer_host/render_process_host.h" 14 #include "chrome/browser/renderer_host/render_process_host.h"
15 #include "chrome/browser/renderer_host/resource_message_filter.h" 15 #include "chrome/browser/renderer_host/resource_message_filter.h"
16 #include "chrome/browser/worker_host/worker_process_host.h" 16 #include "chrome/browser/worker_host/worker_process_host.h"
17 #include "chrome/common/chrome_switches.h" 17 #include "chrome/common/chrome_switches.h"
18 #include "chrome/common/notification_service.h" 18 #include "chrome/common/notification_service.h"
19 #include "chrome/common/render_messages.h" 19 #include "chrome/common/render_messages.h"
20 #include "chrome/common/worker_messages.h" 20 #include "chrome/common/worker_messages.h"
21 #include "net/base/registry_controlled_domain.h" 21 #include "net/base/registry_controlled_domain.h"
22 22
(...skipping 559 matching lines...)
582 FindPendingInstance(url, name, off_the_record); 582 FindPendingInstance(url, name, off_the_record);
583 if (instance) 583 if (instance)
584 return instance; 584 return instance;
585 585
586 // No existing pending worker - create a new one. 586 // No existing pending worker - create a new one.
587 WorkerProcessHost::WorkerInstance pending( 587 WorkerProcessHost::WorkerInstance pending(
588 url, true, off_the_record, name, MSG_ROUTING_NONE, 0, 0, 0, NULL); 588 url, true, off_the_record, name, MSG_ROUTING_NONE, 0, 0, 0, NULL);
589 pending_shared_workers_.push_back(pending); 589 pending_shared_workers_.push_back(pending);
590 return &pending_shared_workers_.back(); 590 return &pending_shared_workers_.back();
591 } 591 }
OLDNEW
« no previous file with comments | « chrome/browser/worker_host/worker_process_host.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine