| Index: content/browser/renderer_host/render_process_host_impl.cc
|
| diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
|
| index 7a225cf71b03d35c77ce75c3c717b481640fabee..a9b8a33a7e21419a2314b382a6a88be203f241a9 100644
|
| --- a/content/browser/renderer_host/render_process_host_impl.cc
|
| +++ b/content/browser/renderer_host/render_process_host_impl.cc
|
| @@ -120,6 +120,7 @@
|
| #include "content/browser/speech/speech_recognition_dispatcher_host.h"
|
| #include "content/browser/storage_partition_impl.h"
|
| #include "content/browser/streams/stream_context.h"
|
| +#include "content/browser/time_zone_monitor.h"
|
| #include "content/browser/tracing/trace_message_filter.h"
|
| #include "content/browser/websockets/websocket_manager.h"
|
| #include "content/browser/webui/web_ui_controller_factory_registry.h"
|
| @@ -1235,6 +1236,16 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
|
| registry.get(), base::Bind(&CreateMemoryCoordinatorHandle, GetID()));
|
| }
|
|
|
| + // BrowserMainLoop, which owns TimeZoneMonitor, is alive for the lifetime of
|
| + // Mojo communication (see BrowserMainLoop::ShutdownThreadsAndCleanUp(),
|
| + // which shuts down Mojo). Hence, passing that TimeZoneMonitor instance as
|
| + // a raw pointer here is safe.
|
| + AddUIThreadInterface(
|
| + registry.get(),
|
| + base::Bind(&TimeZoneMonitor::Bind,
|
| + base::Unretained(
|
| + BrowserMainLoop::GetInstance()->time_zone_monitor())));
|
| +
|
| scoped_refptr<base::SingleThreadTaskRunner> file_task_runner =
|
| BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE);
|
| registry->AddInterface(base::Bind(&MimeRegistryImpl::Create),
|
| @@ -1289,10 +1300,6 @@ void RenderProcessHostImpl::ResumeDeferredNavigation(
|
| widget_helper_->ResumeDeferredNavigation(request_id);
|
| }
|
|
|
| -void RenderProcessHostImpl::NotifyTimezoneChange(const std::string& zone_id) {
|
| - Send(new ViewMsg_TimezoneChange(zone_id));
|
| -}
|
| -
|
| shell::InterfaceProvider* RenderProcessHostImpl::GetRemoteInterfaces() {
|
| return mojo_child_connection_->GetRemoteInterfaces();
|
| }
|
|
|