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

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2706403014: Add Android implementation of navigator.getInstalledRelatedApps. (Closed)
Patch Set: Fixed iframes (now has the correct origin of the frame, not the tab). Created 3 years, 9 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/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 70c236e69898b9bf4e68574bf51f16aaf2401358..aeb1d8f2311c859fc4b6bb7cc097e9c8e4907fe7 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -2306,11 +2306,12 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() {
device::GeolocationServiceContext* geolocation_service_context =
delegate_ ? delegate_->GetGeolocationServiceContext() : NULL;
- // The default (no-op) implementation of InstalledAppProvider.
- // TODO(mgiuca): Implement the "real" one for Android in Java, and do not add
- // the default one on that platform.
+#if !defined(OS_ANDROID)
+ // The default (no-op) implementation of InstalledAppProvider. On Android, the
+ // real implementation is provided in Java.
GetInterfaceRegistry()->AddInterface(
base::Bind(&InstalledAppProviderImplDefault::Create));
+#endif // !defined(OS_ANDROID)
if (geolocation_service_context) {
// TODO(creis): Bind process ID here so that GeolocationServiceImpl

Powered by Google App Engine
This is Rietveld 408576698