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 /* | 5 /* |
6 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. | 6 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. |
7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
9 * (http://www.torchmobile.com/) | 9 * (http://www.torchmobile.com/) |
10 * | 10 * |
(...skipping 1126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1137 } | 1137 } |
1138 | 1138 |
1139 // Don't use the page type from the pending entry. Some interstitial page | 1139 // Don't use the page type from the pending entry. Some interstitial page |
1140 // may have set the type to interstitial. Once we commit, however, the page | 1140 // may have set the type to interstitial. Once we commit, however, the page |
1141 // type must always be normal or error. | 1141 // type must always be normal or error. |
1142 new_entry->set_page_type(params.url_is_unreachable ? PAGE_TYPE_ERROR | 1142 new_entry->set_page_type(params.url_is_unreachable ? PAGE_TYPE_ERROR |
1143 : PAGE_TYPE_NORMAL); | 1143 : PAGE_TYPE_NORMAL); |
1144 new_entry->SetURL(params.url); | 1144 new_entry->SetURL(params.url); |
1145 if (update_virtual_url) | 1145 if (update_virtual_url) |
1146 UpdateVirtualURLToURL(new_entry.get(), params.url); | 1146 UpdateVirtualURLToURL(new_entry.get(), params.url); |
1147 if (params.url.SchemeIs(url::kDataScheme)) | |
1148 new_entry->SetBaseURLForDataURL(params.base_url); | |
Charlie Reis
2016/03/11 23:32:08
This seems too broad. We only use SetBaseURLForDa
| |
1147 new_entry->SetReferrer(params.referrer); | 1149 new_entry->SetReferrer(params.referrer); |
1148 new_entry->SetPageID(params.page_id); | 1150 new_entry->SetPageID(params.page_id); |
1149 new_entry->SetTransitionType(params.transition); | 1151 new_entry->SetTransitionType(params.transition); |
1150 new_entry->set_site_instance( | 1152 new_entry->set_site_instance( |
1151 static_cast<SiteInstanceImpl*>(rfh->GetSiteInstance())); | 1153 static_cast<SiteInstanceImpl*>(rfh->GetSiteInstance())); |
1152 new_entry->SetHasPostData(params.is_post); | 1154 new_entry->SetHasPostData(params.is_post); |
1153 new_entry->SetPostID(params.post_id); | 1155 new_entry->SetPostID(params.post_id); |
1154 new_entry->SetOriginalRequestURL(params.original_request_url); | 1156 new_entry->SetOriginalRequestURL(params.original_request_url); |
1155 new_entry->SetIsOverridingUserAgent(params.is_overriding_user_agent); | 1157 new_entry->SetIsOverridingUserAgent(params.is_overriding_user_agent); |
1156 | 1158 |
(...skipping 914 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2071 } | 2073 } |
2072 } | 2074 } |
2073 } | 2075 } |
2074 | 2076 |
2075 void NavigationControllerImpl::SetGetTimestampCallbackForTest( | 2077 void NavigationControllerImpl::SetGetTimestampCallbackForTest( |
2076 const base::Callback<base::Time()>& get_timestamp_callback) { | 2078 const base::Callback<base::Time()>& get_timestamp_callback) { |
2077 get_timestamp_callback_ = get_timestamp_callback; | 2079 get_timestamp_callback_ = get_timestamp_callback; |
2078 } | 2080 } |
2079 | 2081 |
2080 } // namespace content | 2082 } // namespace content |
OLD | NEW |