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

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

Issue 5512009: Remove unneeded browser_process.h includes. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix linux build Created 10 years 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
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 <string>
8
7 #include "base/command_line.h" 9 #include "base/command_line.h"
8 #include "base/singleton.h" 10 #include "base/singleton.h"
9 #include "base/sys_info.h" 11 #include "base/sys_info.h"
10 #include "base/thread.h" 12 #include "base/thread.h"
11 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/content_settings/host_content_settings_map.h" 13 #include "chrome/browser/content_settings/host_content_settings_map.h"
13 #include "chrome/browser/plugin_service.h" 14 #include "chrome/browser/plugin_service.h"
14 #include "chrome/browser/renderer_host/render_process_host.h" 15 #include "chrome/browser/renderer_host/render_process_host.h"
15 #include "chrome/browser/renderer_host/resource_message_filter.h" 16 #include "chrome/browser/renderer_host/resource_message_filter.h"
16 #include "chrome/browser/worker_host/worker_process_host.h" 17 #include "chrome/browser/worker_host/worker_process_host.h"
17 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
18 #include "chrome/common/notification_service.h" 19 #include "chrome/common/notification_service.h"
19 #include "chrome/common/render_messages.h" 20 #include "chrome/common/render_messages.h"
20 #include "chrome/common/worker_messages.h" 21 #include "chrome/common/worker_messages.h"
21 #include "net/base/registry_controlled_domain.h" 22 #include "net/base/registry_controlled_domain.h"
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 for (WorkerProcessHost::Instances::iterator iter = 286 for (WorkerProcessHost::Instances::iterator iter =
286 pending_shared_workers_.begin(); 287 pending_shared_workers_.begin();
287 iter != pending_shared_workers_.end(); ) { 288 iter != pending_shared_workers_.end(); ) {
288 iter->worker_document_set()->Remove(sender, document_id); 289 iter->worker_document_set()->Remove(sender, document_id);
289 if (iter->worker_document_set()->IsEmpty()) { 290 if (iter->worker_document_set()->IsEmpty()) {
290 iter = pending_shared_workers_.erase(iter); 291 iter = pending_shared_workers_.erase(iter);
291 } else { 292 } else {
292 ++iter; 293 ++iter;
293 } 294 }
294 } 295 }
295
296 } 296 }
297 297
298 void WorkerService::CancelCreateDedicatedWorker(IPC::Message::Sender* sender, 298 void WorkerService::CancelCreateDedicatedWorker(IPC::Message::Sender* sender,
299 int sender_route_id) { 299 int sender_route_id) {
300 for (WorkerProcessHost::Instances::iterator i = queued_workers_.begin(); 300 for (WorkerProcessHost::Instances::iterator i = queued_workers_.begin();
301 i != queued_workers_.end(); ++i) { 301 i != queued_workers_.end(); ++i) {
302 if (i->HasSender(sender, sender_route_id)) { 302 if (i->HasSender(sender, sender_route_id)) {
303 DCHECK(!i->shared()); 303 DCHECK(!i->shared());
304 queued_workers_.erase(i); 304 queued_workers_.erase(i);
305 return; 305 return;
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
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

Powered by Google App Engine
This is Rietveld 408576698