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 1380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1391 | 1391 |
1392 // PlzNavigate | 1392 // PlzNavigate |
1393 void RenderFrameHostImpl::CommitNavigation( | 1393 void RenderFrameHostImpl::CommitNavigation( |
1394 ResourceResponse* response, | 1394 ResourceResponse* response, |
1395 scoped_ptr<StreamHandle> body, | 1395 scoped_ptr<StreamHandle> body, |
1396 const CommonNavigationParams& common_params, | 1396 const CommonNavigationParams& common_params, |
1397 const CommitNavigationParams& commit_params) { | 1397 const CommitNavigationParams& commit_params) { |
1398 // TODO(clamy): Check if we have to add security checks for the browser plugin | 1398 // TODO(clamy): Check if we have to add security checks for the browser plugin |
1399 // guests. | 1399 // guests. |
1400 | 1400 |
1401 SetState(RenderFrameHostImpl::STATE_DEFAULT); | |
clamy
2014/12/16 15:22:48
Could you add the comment that is present in Rende
carlosk
2014/12/19 04:27:14
Done.
| |
1402 | |
1401 Send(new FrameMsg_CommitNavigation( | 1403 Send(new FrameMsg_CommitNavigation( |
1402 routing_id_, response->head, body->GetURL(), | 1404 routing_id_, response->head, body->GetURL(), |
1403 common_params, commit_params)); | 1405 common_params, commit_params)); |
1404 // TODO(clamy): Check if we should start the throbber for non javascript urls | 1406 // TODO(clamy): Check if we should start the throbber for non javascript urls |
1405 // here. | 1407 // here. |
1406 | 1408 |
1407 // TODO(clamy): Release the stream handle once the renderer has finished | 1409 // TODO(clamy): Release the stream handle once the renderer has finished |
1408 // reading it. | 1410 // reading it. |
1409 stream_handle_ = body.Pass(); | 1411 stream_handle_ = body.Pass(); |
1410 } | 1412 } |
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1605 void RenderFrameHostImpl::DidUseGeolocationPermission() { | 1607 void RenderFrameHostImpl::DidUseGeolocationPermission() { |
1606 RenderFrameHost* top_frame = frame_tree_node()->frame_tree()->GetMainFrame(); | 1608 RenderFrameHost* top_frame = frame_tree_node()->frame_tree()->GetMainFrame(); |
1607 GetContentClient()->browser()->RegisterPermissionUsage( | 1609 GetContentClient()->browser()->RegisterPermissionUsage( |
1608 PERMISSION_GEOLOCATION, | 1610 PERMISSION_GEOLOCATION, |
1609 delegate_->GetAsWebContents(), | 1611 delegate_->GetAsWebContents(), |
1610 GetLastCommittedURL().GetOrigin(), | 1612 GetLastCommittedURL().GetOrigin(), |
1611 top_frame->GetLastCommittedURL().GetOrigin()); | 1613 top_frame->GetLastCommittedURL().GetOrigin()); |
1612 } | 1614 } |
1613 | 1615 |
1614 } // namespace content | 1616 } // namespace content |
OLD | NEW |