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

Side by Side Diff: content/common/child_process_host_impl.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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
« no previous file with comments | « content/common/DEPS ('k') | content/common/frame.mojom » ('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/common/child_process_host_impl.h" 5 #include "content/common/child_process_host_impl.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/atomic_sequence_num.h" 9 #include "base/atomic_sequence_num.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 17 matching lines...) Expand all
28 #include "content/public/common/content_switches.h" 28 #include "content/public/common/content_switches.h"
29 #include "gpu/ipc/client/gpu_memory_buffer_impl_shared_memory.h" 29 #include "gpu/ipc/client/gpu_memory_buffer_impl_shared_memory.h"
30 #include "ipc/attachment_broker.h" 30 #include "ipc/attachment_broker.h"
31 #include "ipc/attachment_broker_privileged.h" 31 #include "ipc/attachment_broker_privileged.h"
32 #include "ipc/ipc.mojom.h" 32 #include "ipc/ipc.mojom.h"
33 #include "ipc/ipc_channel.h" 33 #include "ipc/ipc_channel.h"
34 #include "ipc/ipc_channel_mojo.h" 34 #include "ipc/ipc_channel_mojo.h"
35 #include "ipc/ipc_logging.h" 35 #include "ipc/ipc_logging.h"
36 #include "ipc/message_filter.h" 36 #include "ipc/message_filter.h"
37 #include "mojo/edk/embedder/embedder.h" 37 #include "mojo/edk/embedder/embedder.h"
38 #include "services/shell/public/cpp/interface_provider.h" 38 #include "services/service_manager/public/cpp/interface_provider.h"
39 39
40 #if defined(OS_LINUX) 40 #if defined(OS_LINUX)
41 #include "base/linux_util.h" 41 #include "base/linux_util.h"
42 #elif defined(OS_WIN) 42 #elif defined(OS_WIN)
43 #include "content/common/font_cache_dispatcher_win.h" 43 #include "content/common/font_cache_dispatcher_win.h"
44 #endif // OS_LINUX 44 #endif // OS_LINUX
45 45
46 namespace { 46 namespace {
47 47
48 // Global atomic to generate child process unique IDs. 48 // Global atomic to generate child process unique IDs.
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 } 371 }
372 372
373 void ChildProcessHostImpl::OnDeletedGpuMemoryBuffer( 373 void ChildProcessHostImpl::OnDeletedGpuMemoryBuffer(
374 gfx::GpuMemoryBufferId id, 374 gfx::GpuMemoryBufferId id,
375 const gpu::SyncToken& sync_token) { 375 const gpu::SyncToken& sync_token) {
376 // Note: Nothing to do here as ownership of shared memory backed 376 // Note: Nothing to do here as ownership of shared memory backed
377 // GpuMemoryBuffers is passed with IPC. 377 // GpuMemoryBuffers is passed with IPC.
378 } 378 }
379 379
380 } // namespace content 380 } // namespace content
OLDNEW
« no previous file with comments | « content/common/DEPS ('k') | content/common/frame.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698