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

Side by Side Diff: content/child/child_thread.cc

Issue 207603003: Extract RequestInfo struct from ResourceLoaderBridge. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 6 years, 9 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/child/child_thread.h ('k') | content/child/npapi/plugin_url_fetcher.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) 2012 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 "content/child/child_thread.h" 5 #include "content/child/child_thread.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 26 matching lines...) Expand all
37 #include "content/child/service_worker/service_worker_message_filter.h" 37 #include "content/child/service_worker/service_worker_message_filter.h"
38 #include "content/child/socket_stream_dispatcher.h" 38 #include "content/child/socket_stream_dispatcher.h"
39 #include "content/child/thread_safe_sender.h" 39 #include "content/child/thread_safe_sender.h"
40 #include "content/child/websocket_dispatcher.h" 40 #include "content/child/websocket_dispatcher.h"
41 #include "content/common/child_process_messages.h" 41 #include "content/common/child_process_messages.h"
42 #include "content/public/common/content_switches.h" 42 #include "content/public/common/content_switches.h"
43 #include "ipc/ipc_logging.h" 43 #include "ipc/ipc_logging.h"
44 #include "ipc/ipc_switches.h" 44 #include "ipc/ipc_switches.h"
45 #include "ipc/ipc_sync_channel.h" 45 #include "ipc/ipc_sync_channel.h"
46 #include "ipc/ipc_sync_message_filter.h" 46 #include "ipc/ipc_sync_message_filter.h"
47 #include "webkit/child/resource_loader_bridge.h"
47 48
48 #if defined(OS_WIN) 49 #if defined(OS_WIN)
49 #include "content/common/handle_enumerator_win.h" 50 #include "content/common/handle_enumerator_win.h"
50 #endif 51 #endif
51 52
52 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED) 53 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED)
53 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" 54 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
54 #endif 55 #endif
55 56
56 using tracked_objects::ThreadData; 57 using tracked_objects::ThreadData;
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 363
363 return channel_->Send(msg); 364 return channel_->Send(msg);
364 } 365 }
365 366
366 MessageRouter* ChildThread::GetRouter() { 367 MessageRouter* ChildThread::GetRouter() {
367 DCHECK(base::MessageLoop::current() == message_loop()); 368 DCHECK(base::MessageLoop::current() == message_loop());
368 return &router_; 369 return &router_;
369 } 370 }
370 371
371 webkit_glue::ResourceLoaderBridge* ChildThread::CreateBridge( 372 webkit_glue::ResourceLoaderBridge* ChildThread::CreateBridge(
372 const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) { 373 const RequestInfo& request_info) {
373 return resource_dispatcher()->CreateBridge(request_info); 374 return resource_dispatcher()->CreateBridge(request_info);
374 } 375 }
375 376
376 base::SharedMemory* ChildThread::AllocateSharedMemory(size_t buf_size) { 377 base::SharedMemory* ChildThread::AllocateSharedMemory(size_t buf_size) {
377 return AllocateSharedMemory(buf_size, this); 378 return AllocateSharedMemory(buf_size, this);
378 } 379 }
379 380
380 // static 381 // static
381 base::SharedMemory* ChildThread::AllocateSharedMemory( 382 base::SharedMemory* ChildThread::AllocateSharedMemory(
382 size_t buf_size, 383 size_t buf_size,
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 // inflight that would addref it. 538 // inflight that would addref it.
538 Send(new ChildProcessHostMsg_ShutdownRequest); 539 Send(new ChildProcessHostMsg_ShutdownRequest);
539 } 540 }
540 541
541 void ChildThread::EnsureConnected() { 542 void ChildThread::EnsureConnected() {
542 VLOG(0) << "ChildThread::EnsureConnected()"; 543 VLOG(0) << "ChildThread::EnsureConnected()";
543 base::KillProcess(base::GetCurrentProcessHandle(), 0, false); 544 base::KillProcess(base::GetCurrentProcessHandle(), 0, false);
544 } 545 }
545 546
546 } // namespace content 547 } // namespace content
OLDNEW
« no previous file with comments | « content/child/child_thread.h ('k') | content/child/npapi/plugin_url_fetcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698