| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index 3f13b2000edfb77f1988242e714018cd76b1de46..e148637ce747708a5544feb33e69cba687d49e45 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -51,7 +51,6 @@
|
| #include "content/common/gpu/client/gpu_memory_buffer_impl.h"
|
| #include "content/common/gpu/gpu_messages.h"
|
| #include "content/common/gpu/gpu_process_launch_causes.h"
|
| -#include "content/common/mojo/mojo_service_names.h"
|
| #include "content/common/resource_messages.h"
|
| #include "content/common/view_messages.h"
|
| #include "content/common/worker_messages.h"
|
| @@ -92,7 +91,6 @@
|
| #include "content/renderer/service_worker/embedded_worker_context_message_filter.h"
|
| #include "content/renderer/service_worker/embedded_worker_dispatcher.h"
|
| #include "content/renderer/shared_worker/embedded_shared_worker_stub.h"
|
| -#include "content/renderer/web_ui_setup_impl.h"
|
| #include "grit/content_resources.h"
|
| #include "ipc/ipc_channel_handle.h"
|
| #include "ipc/ipc_forwarding_message_filter.h"
|
| @@ -1093,6 +1091,10 @@ void RenderThreadImpl::ReleaseCachedFonts() {
|
|
|
| #endif // OS_WIN
|
|
|
| +ServiceRegistry* RenderThreadImpl::GetServiceRegistry() {
|
| + return service_registry();
|
| +}
|
| +
|
| bool RenderThreadImpl::IsMainThread() {
|
| return !!current();
|
| }
|
| @@ -1173,19 +1175,6 @@ scoped_ptr<gfx::GpuMemoryBuffer> RenderThreadImpl::AllocateGpuMemoryBuffer(
|
| .PassAs<gfx::GpuMemoryBuffer>();
|
| }
|
|
|
| -void RenderThreadImpl::ConnectToService(
|
| - const mojo::String& service_url,
|
| - const mojo::String& service_name,
|
| - mojo::ScopedMessagePipeHandle message_pipe,
|
| - const mojo::String& requestor_url) {
|
| - // TODO(darin): Invent some kind of registration system to use here.
|
| - if (service_url.To<base::StringPiece>() == kRendererService_WebUISetup) {
|
| - WebUISetupImpl::Bind(message_pipe.Pass());
|
| - } else {
|
| - NOTREACHED() << "Unknown service name";
|
| - }
|
| -}
|
| -
|
| void RenderThreadImpl::DoNotSuspendWebKitSharedTimer() {
|
| suspend_webkit_shared_timer_ = false;
|
| }
|
|
|