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 <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
694 } | 694 } |
695 } | 695 } |
696 return false; | 696 return false; |
697 } | 697 } |
698 | 698 |
699 void RenderFrameHostManager::ResetProxyHosts() { | 699 void RenderFrameHostManager::ResetProxyHosts() { |
700 STLDeleteValues(&proxy_hosts_); | 700 STLDeleteValues(&proxy_hosts_); |
701 } | 701 } |
702 | 702 |
703 // PlzNavigate | 703 // PlzNavigate |
704 void RenderFrameHostManager::BeginNavigation(const NavigationRequest& request) { | 704 void RenderFrameHostManager::DidSetNavigationRequest( |
nasko
2015/06/12 17:22:22
nit: I don't have a great alternative for the name
carlosk
2015/06/15 19:11:54
I renamed the method to DidCreateNavigationRequest
nasko
2015/06/15 22:12:45
I think moving the SetNavigationRequest call to th
carlosk
2015/06/16 10:14:46
Moving the SetNavigationRequest call to the constr
| |
705 const NavigationRequest& request) { | |
705 CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch( | 706 CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch( |
706 switches::kEnableBrowserSideNavigation)); | 707 switches::kEnableBrowserSideNavigation)); |
707 // Clean up any state in case there's an ongoing navigation. | 708 // Clean up any state in case there's an ongoing navigation. |
708 // TODO(carlosk): remove this cleanup here once we properly cancel ongoing | 709 // TODO(carlosk): remove this cleanup here once we properly cancel ongoing |
709 // navigations. | 710 // navigations. |
710 CleanUpNavigation(); | 711 CleanUpNavigation(); |
711 | 712 |
712 RenderFrameHostImpl* dest_rfh = GetFrameHostForNavigation(request); | 713 RenderFrameHostImpl* dest_rfh = GetFrameHostForNavigation(request); |
713 DCHECK(dest_rfh); | 714 DCHECK(dest_rfh); |
714 } | 715 } |
(...skipping 1461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2176 void RenderFrameHostManager::DeleteRenderFrameProxyHost( | 2177 void RenderFrameHostManager::DeleteRenderFrameProxyHost( |
2177 SiteInstance* instance) { | 2178 SiteInstance* instance) { |
2178 RenderFrameProxyHostMap::iterator iter = proxy_hosts_.find(instance->GetId()); | 2179 RenderFrameProxyHostMap::iterator iter = proxy_hosts_.find(instance->GetId()); |
2179 if (iter != proxy_hosts_.end()) { | 2180 if (iter != proxy_hosts_.end()) { |
2180 delete iter->second; | 2181 delete iter->second; |
2181 proxy_hosts_.erase(iter); | 2182 proxy_hosts_.erase(iter); |
2182 } | 2183 } |
2183 } | 2184 } |
2184 | 2185 |
2185 } // namespace content | 2186 } // namespace content |
OLD | NEW |