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

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

Issue 2119963002: Move mus to //services/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 5 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 226
227 #if defined(ENABLE_WEBRTC) 227 #if defined(ENABLE_WEBRTC)
228 #include "content/browser/media/webrtc/webrtc_internals.h" 228 #include "content/browser/media/webrtc/webrtc_internals.h"
229 #include "content/browser/renderer_host/media/media_stream_track_metrics_host.h" 229 #include "content/browser/renderer_host/media/media_stream_track_metrics_host.h"
230 #include "content/browser/renderer_host/p2p/socket_dispatcher_host.h" 230 #include "content/browser/renderer_host/p2p/socket_dispatcher_host.h"
231 #include "content/common/media/aec_dump_messages.h" 231 #include "content/common/media/aec_dump_messages.h"
232 #include "content/common/media/media_stream_messages.h" 232 #include "content/common/media/media_stream_messages.h"
233 #endif 233 #endif
234 234
235 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA) 235 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
236 #include "components/mus/common/switches.h" // nogncheck 236 #include "services/ui/common/switches.h" // nogncheck
237 #endif 237 #endif
238 238
239 #if defined(OS_WIN) 239 #if defined(OS_WIN)
240 #define IntToStringType base::IntToString16 240 #define IntToStringType base::IntToString16
241 #else 241 #else
242 #define IntToStringType base::IntToString 242 #define IntToStringType base::IntToString
243 #endif 243 #endif
244 244
245 namespace content { 245 namespace content {
246 namespace { 246 namespace {
(...skipping 2580 matching lines...) Expand 10 before | Expand all | Expand 10 after
2827 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error; 2827 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error;
2828 2828
2829 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing. Alias 2829 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing. Alias
2830 // enough information here so that we can determine what the bad message was. 2830 // enough information here so that we can determine what the bad message was.
2831 base::debug::Alias(&error); 2831 base::debug::Alias(&error);
2832 bad_message::ReceivedBadMessage(process.get(), 2832 bad_message::ReceivedBadMessage(process.get(),
2833 bad_message::RPH_MOJO_PROCESS_ERROR); 2833 bad_message::RPH_MOJO_PROCESS_ERROR);
2834 } 2834 }
2835 2835
2836 } // namespace content 2836 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/DEPS ('k') | content/browser/renderer_host/render_widget_host_view_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698