OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/common/navigation_params.h" | 5 #include "content/common/navigation_params.h" |
6 | 6 |
7 #include "base/memory/ref_counted_memory.h" | 7 #include "base/memory/ref_counted_memory.h" |
8 | 8 |
9 namespace content { | 9 namespace content { |
10 | 10 |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
77 | 77 |
78 StartNavigationParams::~StartNavigationParams() { | 78 StartNavigationParams::~StartNavigationParams() { |
79 } | 79 } |
80 | 80 |
81 RequestNavigationParams::RequestNavigationParams() | 81 RequestNavigationParams::RequestNavigationParams() |
82 : is_overriding_user_agent(false), | 82 : is_overriding_user_agent(false), |
83 browser_navigation_start(base::TimeTicks::Now()), | 83 browser_navigation_start(base::TimeTicks::Now()), |
84 can_load_local_resources(false), | 84 can_load_local_resources(false), |
85 request_time(base::Time::Now()), | 85 request_time(base::Time::Now()), |
86 page_id(-1), | 86 page_id(-1), |
87 nav_entry_id(0), | |
clamy
2015/04/27 11:50:04
Shouldn't we initialize intended_as_new_entry as w
Avi (use Gerrit)
2015/04/27 14:56:33
Gah. Done.
| |
87 pending_history_list_offset(-1), | 88 pending_history_list_offset(-1), |
88 current_history_list_offset(-1), | 89 current_history_list_offset(-1), |
89 current_history_list_length(0), | 90 current_history_list_length(0), |
90 should_clear_history_list(false) { | 91 should_clear_history_list(false) { |
91 } | 92 } |
92 | 93 |
93 RequestNavigationParams::RequestNavigationParams( | 94 RequestNavigationParams::RequestNavigationParams( |
94 bool is_overriding_user_agent, | 95 bool is_overriding_user_agent, |
95 base::TimeTicks navigation_start, | 96 base::TimeTicks navigation_start, |
96 const std::vector<GURL>& redirects, | 97 const std::vector<GURL>& redirects, |
97 bool can_load_local_resources, | 98 bool can_load_local_resources, |
98 base::Time request_time, | 99 base::Time request_time, |
99 const PageState& page_state, | 100 const PageState& page_state, |
100 int32 page_id, | 101 int32 page_id, |
102 int nav_entry_id, | |
103 bool intended_as_new_entry, | |
101 int pending_history_list_offset, | 104 int pending_history_list_offset, |
102 int current_history_list_offset, | 105 int current_history_list_offset, |
103 int current_history_list_length, | 106 int current_history_list_length, |
104 bool should_clear_history_list) | 107 bool should_clear_history_list) |
105 : is_overriding_user_agent(is_overriding_user_agent), | 108 : is_overriding_user_agent(is_overriding_user_agent), |
106 browser_navigation_start(navigation_start), | 109 browser_navigation_start(navigation_start), |
107 redirects(redirects), | 110 redirects(redirects), |
108 can_load_local_resources(can_load_local_resources), | 111 can_load_local_resources(can_load_local_resources), |
109 request_time(request_time), | 112 request_time(request_time), |
110 page_state(page_state), | 113 page_state(page_state), |
111 page_id(page_id), | 114 page_id(page_id), |
115 nav_entry_id(nav_entry_id), | |
116 intended_as_new_entry(intended_as_new_entry), | |
112 pending_history_list_offset(pending_history_list_offset), | 117 pending_history_list_offset(pending_history_list_offset), |
113 current_history_list_offset(current_history_list_offset), | 118 current_history_list_offset(current_history_list_offset), |
114 current_history_list_length(current_history_list_length), | 119 current_history_list_length(current_history_list_length), |
115 should_clear_history_list(should_clear_history_list) { | 120 should_clear_history_list(should_clear_history_list) { |
116 } | 121 } |
117 | 122 |
118 RequestNavigationParams::~RequestNavigationParams() { | 123 RequestNavigationParams::~RequestNavigationParams() { |
119 } | 124 } |
120 | 125 |
121 NavigationParams::NavigationParams( | 126 NavigationParams::NavigationParams( |
122 const CommonNavigationParams& common_params, | 127 const CommonNavigationParams& common_params, |
123 const StartNavigationParams& start_params, | 128 const StartNavigationParams& start_params, |
124 const RequestNavigationParams& request_params) | 129 const RequestNavigationParams& request_params) |
125 : common_params(common_params), | 130 : common_params(common_params), |
126 start_params(start_params), | 131 start_params(start_params), |
127 request_params(request_params) { | 132 request_params(request_params) { |
128 } | 133 } |
129 | 134 |
130 NavigationParams::~NavigationParams() { | 135 NavigationParams::~NavigationParams() { |
131 } | 136 } |
132 | 137 |
133 } // namespace content | 138 } // namespace content |
OLD | NEW |