OLD | NEW |
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 "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/containers/hash_tables.h" | 9 #include "base/containers/hash_tables.h" |
10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
(...skipping 1507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1518 render_view_host_->delegate_->GetDelegateView(); | 1518 render_view_host_->delegate_->GetDelegateView(); |
1519 if (view) | 1519 if (view) |
1520 view->HidePopupMenu(); | 1520 view->HidePopupMenu(); |
1521 } | 1521 } |
1522 #endif | 1522 #endif |
1523 | 1523 |
1524 #if defined(ENABLE_MEDIA_MOJO_RENDERER) | 1524 #if defined(ENABLE_MEDIA_MOJO_RENDERER) |
1525 static void CreateMediaRendererService( | 1525 static void CreateMediaRendererService( |
1526 mojo::InterfaceRequest<mojo::MediaRenderer> request) { | 1526 mojo::InterfaceRequest<mojo::MediaRenderer> request) { |
1527 // The created object is owned by the pipe. | 1527 // The created object is owned by the pipe. |
1528 new media::MojoRendererService(request.Pass()); | 1528 new media::MojoRendererService(nullptr, request.Pass()); |
1529 } | 1529 } |
1530 #endif | 1530 #endif |
1531 | 1531 |
1532 void RenderFrameHostImpl::RegisterMojoServices() { | 1532 void RenderFrameHostImpl::RegisterMojoServices() { |
1533 GeolocationServiceContext* geolocation_service_context = | 1533 GeolocationServiceContext* geolocation_service_context = |
1534 delegate_ ? delegate_->GetGeolocationServiceContext() : NULL; | 1534 delegate_ ? delegate_->GetGeolocationServiceContext() : NULL; |
1535 if (geolocation_service_context) { | 1535 if (geolocation_service_context) { |
1536 // TODO(creis): Bind process ID here so that GeolocationServiceImpl | 1536 // TODO(creis): Bind process ID here so that GeolocationServiceImpl |
1537 // can perform permissions checks once site isolation is complete. | 1537 // can perform permissions checks once site isolation is complete. |
1538 // crbug.com/426384 | 1538 // crbug.com/426384 |
(...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2071 // We may be returning to an existing NavigationEntry that had been granted | 2071 // We may be returning to an existing NavigationEntry that had been granted |
2072 // file access. If this is a different process, we will need to grant the | 2072 // file access. If this is a different process, we will need to grant the |
2073 // access again. The files listed in the page state are validated when they | 2073 // access again. The files listed in the page state are validated when they |
2074 // are received from the renderer to prevent abuse. | 2074 // are received from the renderer to prevent abuse. |
2075 if (request_params.page_state.IsValid()) { | 2075 if (request_params.page_state.IsValid()) { |
2076 render_view_host_->GrantFileAccessFromPageState(request_params.page_state); | 2076 render_view_host_->GrantFileAccessFromPageState(request_params.page_state); |
2077 } | 2077 } |
2078 } | 2078 } |
2079 | 2079 |
2080 } // namespace content | 2080 } // namespace content |
OLD | NEW |