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

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 603273003: Prevent static mojo builds from pulling //ui/gl into mojo_shell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address James' comments Created 6 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 | « no previous file | gpu/command_buffer/client/BUILD.gn » ('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 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "content/browser/renderer_host/render_process_host_impl.h" 8 #include "content/browser/renderer_host/render_process_host_impl.h"
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 #include "content/public/browser/resource_context.h" 125 #include "content/public/browser/resource_context.h"
126 #include "content/public/browser/user_metrics.h" 126 #include "content/public/browser/user_metrics.h"
127 #include "content/public/browser/worker_service.h" 127 #include "content/public/browser/worker_service.h"
128 #include "content/public/common/content_constants.h" 128 #include "content/public/common/content_constants.h"
129 #include "content/public/common/content_switches.h" 129 #include "content/public/common/content_switches.h"
130 #include "content/public/common/process_type.h" 130 #include "content/public/common/process_type.h"
131 #include "content/public/common/resource_type.h" 131 #include "content/public/common/resource_type.h"
132 #include "content/public/common/result_codes.h" 132 #include "content/public/common/result_codes.h"
133 #include "content/public/common/sandboxed_process_launcher_delegate.h" 133 #include "content/public/common/sandboxed_process_launcher_delegate.h"
134 #include "content/public/common/url_constants.h" 134 #include "content/public/common/url_constants.h"
135 #include "gpu/command_buffer/client/gpu_switches.h"
135 #include "gpu/command_buffer/service/gpu_switches.h" 136 #include "gpu/command_buffer/service/gpu_switches.h"
136 #include "ipc/ipc_channel.h" 137 #include "ipc/ipc_channel.h"
137 #include "ipc/ipc_logging.h" 138 #include "ipc/ipc_logging.h"
138 #include "ipc/ipc_switches.h" 139 #include "ipc/ipc_switches.h"
139 #include "ipc/mojo/ipc_channel_mojo.h" 140 #include "ipc/mojo/ipc_channel_mojo.h"
140 #include "ipc/mojo/ipc_channel_mojo_host.h" 141 #include "ipc/mojo/ipc_channel_mojo_host.h"
141 #include "media/base/media_switches.h" 142 #include "media/base/media_switches.h"
142 #include "net/url_request/url_request_context_getter.h" 143 #include "net/url_request/url_request_context_getter.h"
143 #include "ppapi/shared_impl/ppapi_switches.h" 144 #include "ppapi/shared_impl/ppapi_switches.h"
144 #include "storage/browser/fileapi/sandbox_file_system_backend.h" 145 #include "storage/browser/fileapi/sandbox_file_system_backend.h"
(...skipping 2101 matching lines...) Expand 10 before | Expand all | Expand 10 after
2246 if (worker_ref_count_ == 0) 2247 if (worker_ref_count_ == 0)
2247 Cleanup(); 2248 Cleanup();
2248 } 2249 }
2249 2250
2250 void RenderProcessHostImpl::EnsureMojoActivated() { 2251 void RenderProcessHostImpl::EnsureMojoActivated() {
2251 mojo_activation_required_ = true; 2252 mojo_activation_required_ = true;
2252 MaybeActivateMojo(); 2253 MaybeActivateMojo();
2253 } 2254 }
2254 2255
2255 } // namespace content 2256 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | gpu/command_buffer/client/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698