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

Unified Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 583663003: Vibration API : migrate to device/vibration using mojo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove debug logging Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
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 9e46f2276abb407dbfdf3d0364f90284256dfecc..0cc7ce06abb2b5319737875376ed5d28594930ae 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -104,7 +104,6 @@
#include "content/browser/storage_partition_impl.h"
#include "content/browser/streams/stream_context.h"
#include "content/browser/tracing/trace_message_filter.h"
-#include "content/browser/vibration/vibration_message_filter.h"
#include "content/browser/webui/web_ui_controller_factory_registry.h"
#include "content/common/child_process_host_impl.h"
#include "content/common/child_process_messages.h"
@@ -132,6 +131,7 @@
#include "content/public/common/result_codes.h"
#include "content/public/common/sandboxed_process_launcher_delegate.h"
#include "content/public/common/url_constants.h"
+#include "device/vibration/vibration_manager_impl.h"
#include "gpu/command_buffer/service/gpu_switches.h"
#include "ipc/ipc_channel.h"
#include "ipc/ipc_logging.h"
@@ -587,6 +587,7 @@ bool RenderProcessHostImpl::Init() {
GetContentClient()->browser()->RenderProcessWillLaunch(this);
CreateMessageFilters();
+ RegisterMojoServices();
if (run_renderer_in_process()) {
DCHECK(g_renderer_main_thread_factory);
@@ -884,7 +885,6 @@ void RenderProcessHostImpl::CreateMessageFilters() {
switches::kEnableMemoryBenchmarking))
AddFilter(new MemoryBenchmarkMessageFilter());
#endif
- AddFilter(new VibrationMessageFilter());
AddFilter(new PushMessagingMessageFilter(
GetID(), storage_partition_impl_->GetServiceWorkerContext()));
AddFilter(new BatteryStatusMessageFilter());
@@ -2103,7 +2103,8 @@ void RenderProcessHostImpl::OnProcessLaunched() {
// Allow Mojo to be setup before the renderer sees any Chrome IPC messages.
// This way, Mojo can be safely used from the renderer in response to any
// Chrome IPC message.
- MaybeActivateMojo();
+ //MaybeActivateMojo();
Michael van Ouwerkerk 2014/09/29 12:55:19 Maybe delete this line?
timvolodine 2014/10/03 15:57:14 Done. :)
+ mojo_application_host_->Activate(this, GetHandle());
qsr 2014/09/29 08:39:14 There is issue at this level. morrita@ has been wo
timvolodine 2014/10/03 15:57:14 yes, morrita@ is working on a fix.
if (channel_mojo_host_)
channel_mojo_host_->OnClientLaunched(GetHandle());
@@ -2252,4 +2253,9 @@ void RenderProcessHostImpl::EnsureMojoActivated() {
MaybeActivateMojo();
}
+void RenderProcessHostImpl::RegisterMojoServices() {
+ mojo_application_host_->service_registry()
+ ->AddService(base::Bind(&device::VibrationManagerImpl::Create));
+}
+
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698