| 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 1382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1393 } | 1393 } |
| 1394 | 1394 |
| 1395 if (!permission_service_context_) | 1395 if (!permission_service_context_) |
| 1396 permission_service_context_.reset(new PermissionServiceContext(this)); | 1396 permission_service_context_.reset(new PermissionServiceContext(this)); |
| 1397 | 1397 |
| 1398 GetServiceRegistry()->AddService<PermissionService>( | 1398 GetServiceRegistry()->AddService<PermissionService>( |
| 1399 base::Bind(&PermissionServiceContext::CreateService, | 1399 base::Bind(&PermissionServiceContext::CreateService, |
| 1400 base::Unretained(permission_service_context_.get()))); | 1400 base::Unretained(permission_service_context_.get()))); |
| 1401 | 1401 |
| 1402 GetServiceRegistry()->AddService<presentation::PresentationService>( | 1402 GetServiceRegistry()->AddService<presentation::PresentationService>( |
| 1403 base::Bind(&PresentationServiceImpl::CreateMojoService, | 1403 base::Bind(&PresentationServiceImpl::CreateMojoService)); |
| 1404 base::Unretained(this))); | |
| 1405 | 1404 |
| 1406 #if defined(ENABLE_MEDIA_MOJO_RENDERER) | 1405 #if defined(ENABLE_MEDIA_MOJO_RENDERER) |
| 1407 GetServiceRegistry()->AddService<mojo::MediaRenderer>( | 1406 GetServiceRegistry()->AddService<mojo::MediaRenderer>( |
| 1408 base::Bind(&CreateMediaRendererService)); | 1407 base::Bind(&CreateMediaRendererService)); |
| 1409 #endif | 1408 #endif |
| 1410 } | 1409 } |
| 1411 | 1410 |
| 1412 void RenderFrameHostImpl::SetState(RenderFrameHostImplState rfh_state) { | 1411 void RenderFrameHostImpl::SetState(RenderFrameHostImplState rfh_state) { |
| 1413 // Only main frames should be swapped out and retained inside a proxy host. | 1412 // Only main frames should be swapped out and retained inside a proxy host. |
| 1414 if (rfh_state == STATE_SWAPPED_OUT) | 1413 if (rfh_state == STATE_SWAPPED_OUT) |
| (...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1880 void RenderFrameHostImpl::DidUseGeolocationPermission() { | 1879 void RenderFrameHostImpl::DidUseGeolocationPermission() { |
| 1881 RenderFrameHost* top_frame = frame_tree_node()->frame_tree()->GetMainFrame(); | 1880 RenderFrameHost* top_frame = frame_tree_node()->frame_tree()->GetMainFrame(); |
| 1882 GetContentClient()->browser()->RegisterPermissionUsage( | 1881 GetContentClient()->browser()->RegisterPermissionUsage( |
| 1883 PERMISSION_GEOLOCATION, | 1882 PERMISSION_GEOLOCATION, |
| 1884 delegate_->GetAsWebContents(), | 1883 delegate_->GetAsWebContents(), |
| 1885 GetLastCommittedURL().GetOrigin(), | 1884 GetLastCommittedURL().GetOrigin(), |
| 1886 top_frame->GetLastCommittedURL().GetOrigin()); | 1885 top_frame->GetLastCommittedURL().GetOrigin()); |
| 1887 } | 1886 } |
| 1888 | 1887 |
| 1889 } // namespace content | 1888 } // namespace content |
| OLD | NEW |