| 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_NAVIGATION_ENTRY_IMPL_H_ | 5 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_ |
| 6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_ | 6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
| 10 #include "base/memory/scoped_vector.h" | 10 #include "base/memory/scoped_vector.h" |
| 11 #include "base/time/time.h" | 11 #include "base/time/time.h" |
| 12 #include "content/browser/frame_host/frame_navigation_entry.h" | 12 #include "content/browser/frame_host/frame_navigation_entry.h" |
| 13 #include "content/browser/frame_host/frame_tree_node.h" |
| 13 #include "content/browser/site_instance_impl.h" | 14 #include "content/browser/site_instance_impl.h" |
| 14 #include "content/common/frame_message_enums.h" | 15 #include "content/common/frame_message_enums.h" |
| 15 #include "content/public/browser/favicon_status.h" | 16 #include "content/public/browser/favicon_status.h" |
| 16 #include "content/public/browser/global_request_id.h" | 17 #include "content/public/browser/global_request_id.h" |
| 17 #include "content/public/browser/navigation_entry.h" | 18 #include "content/public/browser/navigation_entry.h" |
| 18 #include "content/public/common/page_state.h" | 19 #include "content/public/common/page_state.h" |
| 19 #include "content/public/common/ssl_status.h" | 20 #include "content/public/common/ssl_status.h" |
| 20 | 21 |
| 21 namespace content { | 22 namespace content { |
| 22 struct CommonNavigationParams; | 23 struct CommonNavigationParams; |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 // FrameNavigationEntry. Subframes are only added to the tree if the | 147 // FrameNavigationEntry. Subframes are only added to the tree if the |
| 147 // --site-per-process flag is passed. | 148 // --site-per-process flag is passed. |
| 148 TreeNode* root_node() const { | 149 TreeNode* root_node() const { |
| 149 return frame_tree_.get(); | 150 return frame_tree_.get(); |
| 150 } | 151 } |
| 151 | 152 |
| 152 // Finds the TreeNode associated with |frame_tree_node_id| to add or update | 153 // Finds the TreeNode associated with |frame_tree_node_id| to add or update |
| 153 // its FrameNavigationEntry. A new FrameNavigationEntry is added if none | 154 // its FrameNavigationEntry. A new FrameNavigationEntry is added if none |
| 154 // exists, or else the existing one (which might be shared with other | 155 // exists, or else the existing one (which might be shared with other |
| 155 // NavigationEntries) is updated with the given parameters. | 156 // NavigationEntries) is updated with the given parameters. |
| 156 void AddOrUpdateFrameEntry(int frame_tree_node_id, | 157 void AddOrUpdateFrameEntry(FrameTreeNode* frame_tree_node, |
| 157 SiteInstanceImpl* site_instance, | 158 SiteInstanceImpl* site_instance, |
| 158 const GURL& url, | 159 const GURL& url, |
| 159 const Referrer& referrer); | 160 const Referrer& referrer); |
| 160 | 161 |
| 161 void set_unique_id(int unique_id) { | 162 void set_unique_id(int unique_id) { |
| 162 unique_id_ = unique_id; | 163 unique_id_ = unique_id; |
| 163 } | 164 } |
| 164 | 165 |
| 165 // The SiteInstance represents which pages must share processes. This is a | 166 // The SiteInstance represents which pages must share processes. This is a |
| 166 // reference counted pointer to a shared SiteInstance. | 167 // reference counted pointer to a shared SiteInstance. |
| (...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 431 // persisted, unless specific data is taken out/put back in at save/restore | 432 // persisted, unless specific data is taken out/put back in at save/restore |
| 432 // time (see TabNavigation for an example of this). | 433 // time (see TabNavigation for an example of this). |
| 433 std::map<std::string, base::string16> extra_data_; | 434 std::map<std::string, base::string16> extra_data_; |
| 434 | 435 |
| 435 DISALLOW_COPY_AND_ASSIGN(NavigationEntryImpl); | 436 DISALLOW_COPY_AND_ASSIGN(NavigationEntryImpl); |
| 436 }; | 437 }; |
| 437 | 438 |
| 438 } // namespace content | 439 } // namespace content |
| 439 | 440 |
| 440 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_ | 441 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_ |
| OLD | NEW |