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

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 2431753002: Mus experiment in content shell on Android.
Patch Set: Addressed comments, fixed browser tests and deps. 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
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/renderer/render_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <utility> 10 #include <utility>
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 #endif 198 #endif
199 199
200 #ifdef ENABLE_VTUNE_JIT_INTERFACE 200 #ifdef ENABLE_VTUNE_JIT_INTERFACE
201 #include "v8/src/third_party/vtune/v8-vtune.h" 201 #include "v8/src/third_party/vtune/v8-vtune.h"
202 #endif 202 #endif
203 203
204 #if defined(USE_AURA) 204 #if defined(USE_AURA)
205 #include "content/public/common/service_manager_connection.h" 205 #include "content/public/common/service_manager_connection.h"
206 #include "content/renderer/mus/render_widget_mus_connection.h" 206 #include "content/renderer/mus/render_widget_mus_connection.h"
207 #include "content/renderer/mus/render_widget_window_tree_client_factory.h" 207 #include "content/renderer/mus/render_widget_window_tree_client_factory.h"
208 #include "services/ui/public/cpp/gpu_service.h" 208 #include "services/ui/public/cpp/gpu_service.h" // nogncheck
209 #endif 209 #endif
210 210
211 #if defined(ENABLE_IPC_FUZZER) 211 #if defined(ENABLE_IPC_FUZZER)
212 #include "content/common/external_ipc_dumper.h" 212 #include "content/common/external_ipc_dumper.h"
213 #endif 213 #endif
214 214
215 #if defined(OS_MACOSX) 215 #if defined(OS_MACOSX)
216 #include <malloc/malloc.h> 216 #include <malloc/malloc.h>
217 #else 217 #else
218 #include <malloc.h> 218 #include <malloc.h>
(...skipping 2252 matching lines...) Expand 10 before | Expand all | Expand 10 after
2471 } 2471 }
2472 } 2472 }
2473 2473
2474 void RenderThreadImpl::OnRendererInterfaceRequest( 2474 void RenderThreadImpl::OnRendererInterfaceRequest(
2475 mojom::RendererAssociatedRequest request) { 2475 mojom::RendererAssociatedRequest request) {
2476 DCHECK(!renderer_binding_.is_bound()); 2476 DCHECK(!renderer_binding_.is_bound());
2477 renderer_binding_.Bind(std::move(request)); 2477 renderer_binding_.Bind(std::move(request));
2478 } 2478 }
2479 2479
2480 } // namespace content 2480 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698