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 618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
629 copy->data_url_as_string_ = data_url_as_string_; | 629 copy->data_url_as_string_ = data_url_as_string_; |
630 #endif | 630 #endif |
631 // ResetForCommit: is_renderer_initiated_ | 631 // ResetForCommit: is_renderer_initiated_ |
632 copy->cached_display_title_ = cached_display_title_; | 632 copy->cached_display_title_ = cached_display_title_; |
633 // ResetForCommit: transferred_global_request_id_ | 633 // ResetForCommit: transferred_global_request_id_ |
634 // ResetForCommit: should_replace_entry_ | 634 // ResetForCommit: should_replace_entry_ |
635 copy->redirect_chain_ = redirect_chain_; | 635 copy->redirect_chain_ = redirect_chain_; |
636 // ResetForCommit: should_clear_history_list_ | 636 // ResetForCommit: should_clear_history_list_ |
637 // ResetForCommit: frame_tree_node_id_ | 637 // ResetForCommit: frame_tree_node_id_ |
638 // ResetForCommit: intent_received_timestamp_ | 638 // ResetForCommit: intent_received_timestamp_ |
| 639 #if defined(OS_ANDROID) |
| 640 copy->has_user_gesture_ = has_user_gesture_; |
| 641 #endif |
639 copy->extra_data_ = extra_data_; | 642 copy->extra_data_ = extra_data_; |
640 | 643 |
641 return copy; | 644 return copy; |
642 } | 645 } |
643 | 646 |
644 CommonNavigationParams NavigationEntryImpl::ConstructCommonNavigationParams( | 647 CommonNavigationParams NavigationEntryImpl::ConstructCommonNavigationParams( |
645 const FrameNavigationEntry& frame_entry, | 648 const FrameNavigationEntry& frame_entry, |
646 const scoped_refptr<ResourceRequestBodyImpl>& post_body, | 649 const scoped_refptr<ResourceRequestBodyImpl>& post_body, |
647 const GURL& dest_url, | 650 const GURL& dest_url, |
648 const Referrer& dest_referrer, | 651 const Referrer& dest_referrer, |
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
893 return node; | 896 return node; |
894 | 897 |
895 // Enqueue any children and keep looking. | 898 // Enqueue any children and keep looking. |
896 for (auto* child : node->children) | 899 for (auto* child : node->children) |
897 work_queue.push(child); | 900 work_queue.push(child); |
898 } | 901 } |
899 return nullptr; | 902 return nullptr; |
900 } | 903 } |
901 | 904 |
902 } // namespace content | 905 } // namespace content |
OLD | NEW |