Chromium Code Reviews| Index: content/browser/frame_host/frame_tree_node.cc |
| diff --git a/content/browser/frame_host/frame_tree_node.cc b/content/browser/frame_host/frame_tree_node.cc |
| index 398ac8680b851728dd817520444a9b0af23e0a4a..9691f4b622e4b67f5607e20725332959bbf8337d 100644 |
| --- a/content/browser/frame_host/frame_tree_node.cc |
| +++ b/content/browser/frame_host/frame_tree_node.cc |
| @@ -78,6 +78,7 @@ FrameTreeNode::FrameTreeNode( |
| RenderFrameHostManager::Delegate* manager_delegate, |
| blink::WebTreeScopeType scope, |
| const std::string& name, |
| + const std::string& unique_name, |
| const blink::WebFrameOwnerProperties& frame_owner_properties) |
| : frame_tree_(frame_tree), |
| navigator_(navigator), |
| @@ -94,6 +95,7 @@ FrameTreeNode::FrameTreeNode( |
| replication_state_( |
| scope, |
| name, |
| + unique_name, |
| blink::WebSandboxFlags::None, |
| false /* should enforce strict mixed content checking */), |
| pending_sandbox_flags_(blink::WebSandboxFlags::None), |
| @@ -203,10 +205,12 @@ void FrameTreeNode::SetCurrentOrigin(const url::Origin& origin) { |
| replication_state_.origin = origin; |
| } |
| -void FrameTreeNode::SetFrameName(const std::string& name) { |
| +void FrameTreeNode::SetFrameName(const std::string& name, |
| + const std::string& unique_name) { |
| if (name != replication_state_.name) |
|
alexmos
2016/02/10 00:46:46
Maybe add a comment here explaining why there's no
Łukasz Anforowicz
2016/02/10 22:10:51
Done (via a combination of a comment + DCHECK + re
|
| - render_manager_.OnDidUpdateName(name); |
| + render_manager_.OnDidUpdateName(name, unique_name); |
| replication_state_.name = name; |
| + replication_state_.unique_name = unique_name; |
| } |
| void FrameTreeNode::SetEnforceStrictMixedContentChecking(bool should_enforce) { |