| 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 #ifndef CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_ | 5 #ifndef CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_ |
| 6 #define CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_ | 6 #define CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 | 107 |
| 108 void set_sandbox_flags(blink::WebSandboxFlags sandbox_flags) { | 108 void set_sandbox_flags(blink::WebSandboxFlags sandbox_flags) { |
| 109 replication_state_.sandbox_flags = sandbox_flags; | 109 replication_state_.sandbox_flags = sandbox_flags; |
| 110 } | 110 } |
| 111 | 111 |
| 112 // Transfer any pending sandbox flags into |effective_sandbox_flags_|, and | 112 // Transfer any pending sandbox flags into |effective_sandbox_flags_|, and |
| 113 // return true if the sandbox flags were changed. | 113 // return true if the sandbox flags were changed. |
| 114 bool CommitPendingSandboxFlags(); | 114 bool CommitPendingSandboxFlags(); |
| 115 | 115 |
| 116 bool HasSameOrigin(const FrameTreeNode& node) const { | 116 bool HasSameOrigin(const FrameTreeNode& node) const { |
| 117 return replication_state_.origin.IsSameAs(node.replication_state_.origin); | 117 return replication_state_.origin.IsSameOriginWith( |
| 118 node.replication_state_.origin); |
| 118 } | 119 } |
| 119 | 120 |
| 120 const FrameReplicationState& current_replication_state() const { | 121 const FrameReplicationState& current_replication_state() const { |
| 121 return replication_state_; | 122 return replication_state_; |
| 122 } | 123 } |
| 123 | 124 |
| 124 RenderFrameHostImpl* current_frame_host() const { | 125 RenderFrameHostImpl* current_frame_host() const { |
| 125 return render_manager_.current_frame_host(); | 126 return render_manager_.current_frame_host(); |
| 126 } | 127 } |
| 127 | 128 |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 // Owns an ongoing NavigationRequest until it is ready to commit. It will then | 229 // Owns an ongoing NavigationRequest until it is ready to commit. It will then |
| 229 // be reset and a RenderFrameHost will be responsible for the navigation. | 230 // be reset and a RenderFrameHost will be responsible for the navigation. |
| 230 scoped_ptr<NavigationRequest> navigation_request_; | 231 scoped_ptr<NavigationRequest> navigation_request_; |
| 231 | 232 |
| 232 DISALLOW_COPY_AND_ASSIGN(FrameTreeNode); | 233 DISALLOW_COPY_AND_ASSIGN(FrameTreeNode); |
| 233 }; | 234 }; |
| 234 | 235 |
| 235 } // namespace content | 236 } // namespace content |
| 236 | 237 |
| 237 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_ | 238 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_ |
| OLD | NEW |