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

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

Issue 2629523008: Shape Detection: Remove ConstructorCallWith=Document (Closed)
Patch Set: Add layout test for worker Created 3 years, 11 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 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 #include "mojo/edk/embedder/embedder.h" 180 #include "mojo/edk/embedder/embedder.h"
181 #include "mojo/public/cpp/bindings/associated_interface_ptr.h" 181 #include "mojo/public/cpp/bindings/associated_interface_ptr.h"
182 #include "net/url_request/url_request_context_getter.h" 182 #include "net/url_request/url_request_context_getter.h"
183 #include "ppapi/features/features.h" 183 #include "ppapi/features/features.h"
184 #include "ppapi/shared_impl/ppapi_switches.h" 184 #include "ppapi/shared_impl/ppapi_switches.h"
185 #include "services/service_manager/public/cpp/connection.h" 185 #include "services/service_manager/public/cpp/connection.h"
186 #include "services/service_manager/public/cpp/interface_provider.h" 186 #include "services/service_manager/public/cpp/interface_provider.h"
187 #include "services/service_manager/public/cpp/interface_registry.h" 187 #include "services/service_manager/public/cpp/interface_registry.h"
188 #include "services/service_manager/runner/common/client_util.h" 188 #include "services/service_manager/runner/common/client_util.h"
189 #include "services/service_manager/runner/common/switches.h" 189 #include "services/service_manager/runner/common/switches.h"
190 #include "services/shape_detection/public/interfaces/barcodedetection.mojom.h"
191 #include "services/shape_detection/public/interfaces/facedetection_provider.mojo m.h"
192 #include "services/shape_detection/public/interfaces/textdetection.mojom.h"
190 #include "storage/browser/fileapi/sandbox_file_system_backend.h" 193 #include "storage/browser/fileapi/sandbox_file_system_backend.h"
191 #include "third_party/WebKit/public/public_features.h" 194 #include "third_party/WebKit/public/public_features.h"
192 #include "third_party/skia/include/core/SkBitmap.h" 195 #include "third_party/skia/include/core/SkBitmap.h"
193 #include "ui/base/ui_base_switches.h" 196 #include "ui/base/ui_base_switches.h"
194 #include "ui/display/display_switches.h" 197 #include "ui/display/display_switches.h"
195 #include "ui/gfx/switches.h" 198 #include "ui/gfx/switches.h"
196 #include "ui/gl/gl_switches.h" 199 #include "ui/gl/gl_switches.h"
197 #include "ui/gl/gpu_switching_manager.h" 200 #include "ui/gl/gpu_switching_manager.h"
198 #include "ui/native_theme/native_theme_switches.h" 201 #include "ui/native_theme/native_theme_switches.h"
199 202
(...skipping 995 matching lines...) Expand 10 before | Expand all | Expand 10 after
1195 base::Bind(&RenderProcessHostImpl::OnRouteProviderRequest, 1198 base::Bind(&RenderProcessHostImpl::OnRouteProviderRequest,
1196 base::Unretained(this))); 1199 base::Unretained(this)));
1197 1200
1198 channel_->AddAssociatedInterfaceForIOThread( 1201 channel_->AddAssociatedInterfaceForIOThread(
1199 base::Bind(&IndexedDBDispatcherHost::AddBinding, indexed_db_factory_)); 1202 base::Bind(&IndexedDBDispatcherHost::AddBinding, indexed_db_factory_));
1200 1203
1201 #if defined(OS_ANDROID) 1204 #if defined(OS_ANDROID)
1202 AddUIThreadInterface(registry.get(), 1205 AddUIThreadInterface(registry.get(),
1203 GetGlobalJavaInterfaces() 1206 GetGlobalJavaInterfaces()
1204 ->CreateInterfaceFactory<device::BatteryMonitor>()); 1207 ->CreateInterfaceFactory<device::BatteryMonitor>());
1208 AddUIThreadInterface(
1209 registry.get(), GetGlobalJavaInterfaces()
1210 ->CreateInterfaceFactory<
1211 shape_detection::mojom::FaceDetectionProvider>());
1212 AddUIThreadInterface(
1213 registry.get(),
1214 GetGlobalJavaInterfaces()
1215 ->CreateInterfaceFactory<shape_detection::mojom::BarcodeDetection>());
1216 AddUIThreadInterface(
1217 registry.get(),
1218 GetGlobalJavaInterfaces()
1219 ->CreateInterfaceFactory<shape_detection::mojom::TextDetection>());
1205 #else 1220 #else
1206 AddUIThreadInterface( 1221 AddUIThreadInterface(
1207 registry.get(), base::Bind(&device::BatteryMonitorImpl::Create)); 1222 registry.get(), base::Bind(&device::BatteryMonitorImpl::Create));
1208 #endif 1223 #endif
1209 AddUIThreadInterface( 1224 AddUIThreadInterface(
1210 registry.get(), 1225 registry.get(),
1211 base::Bind(&PermissionServiceContext::CreateService, 1226 base::Bind(&PermissionServiceContext::CreateService,
1212 base::Unretained(permission_service_context_.get()))); 1227 base::Unretained(permission_service_context_.get())));
1213 // TODO(mcasas): finalize arguments. 1228 // TODO(mcasas): finalize arguments.
1214 AddUIThreadInterface(registry.get(), base::Bind(&ImageCaptureImpl::Create)); 1229 AddUIThreadInterface(registry.get(), base::Bind(&ImageCaptureImpl::Create));
(...skipping 1817 matching lines...) Expand 10 before | Expand all | Expand 10 after
3032 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error; 3047 LOG(ERROR) << "Terminating render process for bad Mojo message: " << error;
3033 3048
3034 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing. 3049 // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing.
3035 // Capture the error message in a crash key value. 3050 // Capture the error message in a crash key value.
3036 base::debug::ScopedCrashKey error_key_value("mojo-message-error", error); 3051 base::debug::ScopedCrashKey error_key_value("mojo-message-error", error);
3037 bad_message::ReceivedBadMessage(render_process_id, 3052 bad_message::ReceivedBadMessage(render_process_id,
3038 bad_message::RPH_MOJO_PROCESS_ERROR); 3053 bad_message::RPH_MOJO_PROCESS_ERROR);
3039 } 3054 }
3040 3055
3041 } // namespace content 3056 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.cc ('k') | content/public/app/mojo/content_browser_manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698