Chromium Code Reviews| 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/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| (...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 418 // doesn't matter. | 418 // doesn't matter. |
| 419 render_frame_host->frame_tree_node()->navigator()->RequestTransferURL( | 419 render_frame_host->frame_tree_node()->navigator()->RequestTransferURL( |
| 420 render_frame_host, | 420 render_frame_host, |
| 421 transfer_url, | 421 transfer_url, |
| 422 pending_nav_params_->transfer_url_chain, | 422 pending_nav_params_->transfer_url_chain, |
| 423 pending_nav_params_->referrer, | 423 pending_nav_params_->referrer, |
| 424 pending_nav_params_->page_transition, | 424 pending_nav_params_->page_transition, |
| 425 CURRENT_TAB, | 425 CURRENT_TAB, |
| 426 pending_nav_params_->global_request_id, | 426 pending_nav_params_->global_request_id, |
| 427 pending_nav_params_->should_replace_current_entry, | 427 pending_nav_params_->should_replace_current_entry, |
| 428 true); | 428 true, false); |
|
nasko
2014/07/03 09:39:30
Why is this hardcoded to false? It seems like it w
| |
| 429 } else if (pending_render_frame_host_) { | 429 } else if (pending_render_frame_host_) { |
| 430 RenderProcessHostImpl* pending_process = | 430 RenderProcessHostImpl* pending_process = |
| 431 static_cast<RenderProcessHostImpl*>( | 431 static_cast<RenderProcessHostImpl*>( |
| 432 pending_render_frame_host_->GetProcess()); | 432 pending_render_frame_host_->GetProcess()); |
| 433 pending_process->ResumeDeferredNavigation( | 433 pending_process->ResumeDeferredNavigation( |
| 434 pending_nav_params_->global_request_id); | 434 pending_nav_params_->global_request_id); |
| 435 } | 435 } |
| 436 pending_nav_params_.reset(); | 436 pending_nav_params_.reset(); |
| 437 } | 437 } |
| 438 | 438 |
| (...skipping 1045 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1484 SiteInstance* instance) const { | 1484 SiteInstance* instance) const { |
| 1485 RenderFrameProxyHostMap::const_iterator iter = | 1485 RenderFrameProxyHostMap::const_iterator iter = |
| 1486 proxy_hosts_.find(instance->GetId()); | 1486 proxy_hosts_.find(instance->GetId()); |
| 1487 if (iter != proxy_hosts_.end()) | 1487 if (iter != proxy_hosts_.end()) |
| 1488 return iter->second; | 1488 return iter->second; |
| 1489 | 1489 |
| 1490 return NULL; | 1490 return NULL; |
| 1491 } | 1491 } |
| 1492 | 1492 |
| 1493 } // namespace content | 1493 } // namespace content |
| OLD | NEW |