Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(262)

Side by Side Diff: content/browser/frame_host/frame_tree_node.h

Issue 1151843002: DO NOT LAND Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | content/browser/frame_host/frame_tree_node.cc » ('j') | net/base/net_util.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 104
105 void set_sandbox_flags(SandboxFlags sandbox_flags) { 105 void set_sandbox_flags(SandboxFlags sandbox_flags) {
106 replication_state_.sandbox_flags = sandbox_flags; 106 replication_state_.sandbox_flags = sandbox_flags;
107 } 107 }
108 108
109 // Transfer any pending sandbox flags into |effective_sandbox_flags_|, and 109 // Transfer any pending sandbox flags into |effective_sandbox_flags_|, and
110 // return true if the sandbox flags were changed. 110 // return true if the sandbox flags were changed.
111 bool CommitPendingSandboxFlags(); 111 bool CommitPendingSandboxFlags();
112 112
113 bool HasSameOrigin(const FrameTreeNode& node) const { 113 bool HasSameOrigin(const FrameTreeNode& node) const {
114 return replication_state_.origin.IsSameAs(node.replication_state_.origin); 114 return replication_state_.origin == node.replication_state_.origin;
115 } 115 }
116 116
117 const FrameReplicationState& current_replication_state() const { 117 const FrameReplicationState& current_replication_state() const {
118 return replication_state_; 118 return replication_state_;
119 } 119 }
120 120
121 RenderFrameHostImpl* current_frame_host() const { 121 RenderFrameHostImpl* current_frame_host() const {
122 return render_manager_.current_frame_host(); 122 return render_manager_.current_frame_host();
123 } 123 }
124 124
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 // Owns an ongoing NavigationRequest until it is ready to commit. It will then 225 // Owns an ongoing NavigationRequest until it is ready to commit. It will then
226 // be reset and a RenderFrameHost will be responsible for the navigation. 226 // be reset and a RenderFrameHost will be responsible for the navigation.
227 scoped_ptr<NavigationRequest> navigation_request_; 227 scoped_ptr<NavigationRequest> navigation_request_;
228 228
229 DISALLOW_COPY_AND_ASSIGN(FrameTreeNode); 229 DISALLOW_COPY_AND_ASSIGN(FrameTreeNode);
230 }; 230 };
231 231
232 } // namespace content 232 } // namespace content
233 233
234 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_ 234 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/frame_host/frame_tree_node.cc » ('j') | net/base/net_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698