| 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_manager.h" | 5 #include "content/browser/frame_host/render_frame_host_manager.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 669 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 680 // PlzNavigate | 680 // PlzNavigate |
| 681 if (speculative_render_frame_host_) | 681 if (speculative_render_frame_host_) |
| 682 speculative_render_frame_host_->ClearAllWebUI(); | 682 speculative_render_frame_host_->ClearAllWebUI(); |
| 683 } | 683 } |
| 684 | 684 |
| 685 // PlzNavigate | 685 // PlzNavigate |
| 686 void RenderFrameHostManager::DidCreateNavigationRequest( | 686 void RenderFrameHostManager::DidCreateNavigationRequest( |
| 687 NavigationRequest* request) { | 687 NavigationRequest* request) { |
| 688 CHECK(IsBrowserSideNavigationEnabled()); | 688 CHECK(IsBrowserSideNavigationEnabled()); |
| 689 RenderFrameHostImpl* dest_rfh = GetFrameHostForNavigation(*request); | 689 RenderFrameHostImpl* dest_rfh = GetFrameHostForNavigation(*request); |
| 690 dest_rfh->GetSiteInstance()->UsedFor(request->common_params().url); |
| 690 DCHECK(dest_rfh); | 691 DCHECK(dest_rfh); |
| 691 request->set_associated_site_instance_type( | 692 request->set_associated_site_instance_type( |
| 692 dest_rfh == render_frame_host_.get() | 693 dest_rfh == render_frame_host_.get() |
| 693 ? NavigationRequest::AssociatedSiteInstanceType::CURRENT | 694 ? NavigationRequest::AssociatedSiteInstanceType::CURRENT |
| 694 : NavigationRequest::AssociatedSiteInstanceType::SPECULATIVE); | 695 : NavigationRequest::AssociatedSiteInstanceType::SPECULATIVE); |
| 695 } | 696 } |
| 696 | 697 |
| 697 // PlzNavigate | 698 // PlzNavigate |
| 698 RenderFrameHostImpl* RenderFrameHostManager::GetFrameHostForNavigation( | 699 RenderFrameHostImpl* RenderFrameHostManager::GetFrameHostForNavigation( |
| 699 const NavigationRequest& request) { | 700 const NavigationRequest& request) { |
| (...skipping 2108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2808 delegate_->IsHidden()) { | 2809 delegate_->IsHidden()) { |
| 2809 if (delegate_->IsHidden()) { | 2810 if (delegate_->IsHidden()) { |
| 2810 render_frame_host_->GetView()->Hide(); | 2811 render_frame_host_->GetView()->Hide(); |
| 2811 } else { | 2812 } else { |
| 2812 render_frame_host_->GetView()->Show(); | 2813 render_frame_host_->GetView()->Show(); |
| 2813 } | 2814 } |
| 2814 } | 2815 } |
| 2815 } | 2816 } |
| 2816 | 2817 |
| 2817 } // namespace content | 2818 } // namespace content |
| OLD | NEW |