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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "content/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 2288 matching lines...) Expand 10 before | Expand all | Expand 10 after
2299 const gfx::Rect& initial_rect, 2299 const gfx::Rect& initial_rect,
2300 bool user_gesture) { 2300 bool user_gesture) {
2301 delegate_->ShowCreatedWindow(GetProcess()->GetID(), pending_widget_routing_id, 2301 delegate_->ShowCreatedWindow(GetProcess()->GetID(), pending_widget_routing_id,
2302 disposition, initial_rect, user_gesture); 2302 disposition, initial_rect, user_gesture);
2303 } 2303 }
2304 2304
2305 void RenderFrameHostImpl::RegisterMojoInterfaces() { 2305 void RenderFrameHostImpl::RegisterMojoInterfaces() {
2306 device::GeolocationServiceContext* geolocation_service_context = 2306 device::GeolocationServiceContext* geolocation_service_context =
2307 delegate_ ? delegate_->GetGeolocationServiceContext() : NULL; 2307 delegate_ ? delegate_->GetGeolocationServiceContext() : NULL;
2308 2308
2309 // The default (no-op) implementation of InstalledAppProvider. 2309 #if !defined(OS_ANDROID)
2310 // TODO(mgiuca): Implement the "real" one for Android in Java, and do not add 2310 // The default (no-op) implementation of InstalledAppProvider. On Android, the
2311 // the default one on that platform. 2311 // real implementation is provided in Java.
2312 GetInterfaceRegistry()->AddInterface( 2312 GetInterfaceRegistry()->AddInterface(
2313 base::Bind(&InstalledAppProviderImplDefault::Create)); 2313 base::Bind(&InstalledAppProviderImplDefault::Create));
2314 #endif // !defined(OS_ANDROID)
2314 2315
2315 if (geolocation_service_context) { 2316 if (geolocation_service_context) {
2316 // TODO(creis): Bind process ID here so that GeolocationServiceImpl 2317 // TODO(creis): Bind process ID here so that GeolocationServiceImpl
2317 // can perform permissions checks once site isolation is complete. 2318 // can perform permissions checks once site isolation is complete.
2318 // crbug.com/426384 2319 // crbug.com/426384
2319 // NOTE: At shutdown, there is no guaranteed ordering between destruction of 2320 // NOTE: At shutdown, there is no guaranteed ordering between destruction of
2320 // this object and destruction of any GeolocationServicesImpls created via 2321 // this object and destruction of any GeolocationServicesImpls created via
2321 // the below service registry, the reason being that the destruction of the 2322 // the below service registry, the reason being that the destruction of the
2322 // latter is triggered by receiving a message that the pipe was closed from 2323 // latter is triggered by receiving a message that the pipe was closed from
2323 // the renderer side. Hence, supply the reference to this object as a weak 2324 // the renderer side. Hence, supply the reference to this object as a weak
(...skipping 1190 matching lines...) Expand 10 before | Expand all | Expand 10 after
3514 service_manager::mojom::InterfaceProviderPtr provider; 3515 service_manager::mojom::InterfaceProviderPtr provider;
3515 BindInterfaceRegistryForRenderFrameHost(mojo::MakeRequest(&provider), this); 3516 BindInterfaceRegistryForRenderFrameHost(mojo::MakeRequest(&provider), this);
3516 java_interfaces_.reset(new service_manager::InterfaceProvider); 3517 java_interfaces_.reset(new service_manager::InterfaceProvider);
3517 java_interfaces_->Bind(std::move(provider)); 3518 java_interfaces_->Bind(std::move(provider));
3518 } 3519 }
3519 return java_interfaces_.get(); 3520 return java_interfaces_.get();
3520 } 3521 }
3521 #endif 3522 #endif
3522 3523
3523 } // namespace content 3524 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698