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/navigation_entry_impl.h" | 5 #include "content/browser/frame_host/navigation_entry_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <queue> | 9 #include <queue> |
10 #include <utility> | 10 #include <utility> |
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
252 title_(title), | 252 title_(title), |
253 page_id_(page_id), | 253 page_id_(page_id), |
254 transition_type_(transition_type), | 254 transition_type_(transition_type), |
255 restore_type_(RESTORE_NONE), | 255 restore_type_(RESTORE_NONE), |
256 is_overriding_user_agent_(false), | 256 is_overriding_user_agent_(false), |
257 http_status_code_(0), | 257 http_status_code_(0), |
258 is_renderer_initiated_(is_renderer_initiated), | 258 is_renderer_initiated_(is_renderer_initiated), |
259 should_replace_entry_(false), | 259 should_replace_entry_(false), |
260 should_clear_history_list_(false), | 260 should_clear_history_list_(false), |
261 can_load_local_resources_(false), | 261 can_load_local_resources_(false), |
262 frame_tree_node_id_(-1) { | 262 frame_tree_node_id_(-1), |
263 reload_type_(NavigationController::NO_RELOAD) { | |
263 #if defined(OS_ANDROID) | 264 #if defined(OS_ANDROID) |
264 has_user_gesture_ = false; | 265 has_user_gesture_ = false; |
265 #endif | 266 #endif |
266 } | 267 } |
267 | 268 |
268 NavigationEntryImpl::~NavigationEntryImpl() { | 269 NavigationEntryImpl::~NavigationEntryImpl() { |
269 } | 270 } |
270 | 271 |
271 int NavigationEntryImpl::GetUniqueID() const { | 272 int NavigationEntryImpl::GetUniqueID() const { |
272 return unique_id_; | 273 return unique_id_; |
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
629 copy->data_url_as_string_ = data_url_as_string_; | 630 copy->data_url_as_string_ = data_url_as_string_; |
630 #endif | 631 #endif |
631 // ResetForCommit: is_renderer_initiated_ | 632 // ResetForCommit: is_renderer_initiated_ |
632 copy->cached_display_title_ = cached_display_title_; | 633 copy->cached_display_title_ = cached_display_title_; |
633 // ResetForCommit: transferred_global_request_id_ | 634 // ResetForCommit: transferred_global_request_id_ |
634 // ResetForCommit: should_replace_entry_ | 635 // ResetForCommit: should_replace_entry_ |
635 copy->redirect_chain_ = redirect_chain_; | 636 copy->redirect_chain_ = redirect_chain_; |
636 // ResetForCommit: should_clear_history_list_ | 637 // ResetForCommit: should_clear_history_list_ |
637 // ResetForCommit: frame_tree_node_id_ | 638 // ResetForCommit: frame_tree_node_id_ |
638 // ResetForCommit: intent_received_timestamp_ | 639 // ResetForCommit: intent_received_timestamp_ |
640 #if defined(OS_ANDROID) | |
Takashi Toyoshima
2016/08/09 12:06:18
Maybe this copy should be done?
Charlie Reis
2016/08/10 05:05:13
Good catch! Looks like qinmin@ missed that in htt
Takashi Toyoshima
2016/08/10 06:34:15
OK, I made this https://codereview.chromium.org/22
| |
641 copt->has_user_gesture_ = has_user_gesture_; | |
642 #endif | |
643 copy->reload_type_ = reload_type_; | |
639 copy->extra_data_ = extra_data_; | 644 copy->extra_data_ = extra_data_; |
640 | 645 |
641 return copy; | 646 return copy; |
642 } | 647 } |
643 | 648 |
644 CommonNavigationParams NavigationEntryImpl::ConstructCommonNavigationParams( | 649 CommonNavigationParams NavigationEntryImpl::ConstructCommonNavigationParams( |
645 const FrameNavigationEntry& frame_entry, | 650 const FrameNavigationEntry& frame_entry, |
646 const scoped_refptr<ResourceRequestBodyImpl>& post_body, | 651 const scoped_refptr<ResourceRequestBodyImpl>& post_body, |
647 const GURL& dest_url, | 652 const GURL& dest_url, |
648 const Referrer& dest_referrer, | 653 const Referrer& dest_referrer, |
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
893 return node; | 898 return node; |
894 | 899 |
895 // Enqueue any children and keep looking. | 900 // Enqueue any children and keep looking. |
896 for (auto* child : node->children) | 901 for (auto* child : node->children) |
897 work_queue.push(child); | 902 work_queue.push(child); |
898 } | 903 } |
899 return nullptr; | 904 return nullptr; |
900 } | 905 } |
901 | 906 |
902 } // namespace content | 907 } // namespace content |
OLD | NEW |