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

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

Issue 226273005: Remove webkit's ResourceLoaderBridge interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: StartSync -> StartAsync -> Cancel - change StartAsync to request request_id Created 6 years, 8 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
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"
48 47
49 #if defined(OS_WIN) 48 #if defined(OS_WIN)
50 #include "content/common/handle_enumerator_win.h" 49 #include "content/common/handle_enumerator_win.h"
51 #endif 50 #endif
52 51
53 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED) 52 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED)
54 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" 53 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
55 #endif 54 #endif
56 55
57 using tracked_objects::ThreadData; 56 using tracked_objects::ThreadData;
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 } 356 }
358 357
359 return channel_->Send(msg); 358 return channel_->Send(msg);
360 } 359 }
361 360
362 MessageRouter* ChildThread::GetRouter() { 361 MessageRouter* ChildThread::GetRouter() {
363 DCHECK(base::MessageLoop::current() == message_loop()); 362 DCHECK(base::MessageLoop::current() == message_loop());
364 return &router_; 363 return &router_;
365 } 364 }
366 365
367 webkit_glue::ResourceLoaderBridge* ChildThread::CreateBridge(
368 const RequestInfo& request_info) {
369 return resource_dispatcher()->CreateBridge(request_info);
370 }
371
372 base::SharedMemory* ChildThread::AllocateSharedMemory(size_t buf_size) { 366 base::SharedMemory* ChildThread::AllocateSharedMemory(size_t buf_size) {
373 return AllocateSharedMemory(buf_size, this); 367 return AllocateSharedMemory(buf_size, this);
374 } 368 }
375 369
376 // static 370 // static
377 base::SharedMemory* ChildThread::AllocateSharedMemory( 371 base::SharedMemory* ChildThread::AllocateSharedMemory(
378 size_t buf_size, 372 size_t buf_size,
379 IPC::Sender* sender) { 373 IPC::Sender* sender) {
380 scoped_ptr<base::SharedMemory> shared_buf; 374 scoped_ptr<base::SharedMemory> shared_buf;
381 #if defined(OS_WIN) 375 #if defined(OS_WIN)
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 // inflight that would addref it. 527 // inflight that would addref it.
534 Send(new ChildProcessHostMsg_ShutdownRequest); 528 Send(new ChildProcessHostMsg_ShutdownRequest);
535 } 529 }
536 530
537 void ChildThread::EnsureConnected() { 531 void ChildThread::EnsureConnected() {
538 VLOG(0) << "ChildThread::EnsureConnected()"; 532 VLOG(0) << "ChildThread::EnsureConnected()";
539 base::KillProcess(base::GetCurrentProcessHandle(), 0, false); 533 base::KillProcess(base::GetCurrentProcessHandle(), 0, false);
540 } 534 }
541 535
542 } // namespace content 536 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698