Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(169)

Side by Side Diff: ios/web/navigation/navigation_manager_impl.mm

Issue 2805453002: Reland of Set user agent type of transient item the same as pending item (Closed)
Patch Set: Fix Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #import "ios/web/navigation/navigation_manager_impl.h" 5 #import "ios/web/navigation/navigation_manager_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 } 163 }
164 164
165 void NavigationManagerImpl::LoadURL(const GURL& url, 165 void NavigationManagerImpl::LoadURL(const GURL& url,
166 const web::Referrer& referrer, 166 const web::Referrer& referrer,
167 ui::PageTransition type) { 167 ui::PageTransition type) {
168 WebState::OpenURLParams params(url, referrer, 168 WebState::OpenURLParams params(url, referrer,
169 WindowOpenDisposition::CURRENT_TAB, type, NO); 169 WindowOpenDisposition::CURRENT_TAB, type, NO);
170 delegate_->GetWebState()->OpenURL(params); 170 delegate_->GetWebState()->OpenURL(params);
171 } 171 }
172 172
173 void NavigationManagerImpl::AddTransientItem(const GURL& url) {
174 [session_controller_ addTransientItemWithURL:url];
175
176 // TODO(crbug.com/676129): Add a DCHECK that pending item should always exists
177 // when the bug is fixed, because transient item is only supposed to be added
178 // for pending non-app-specific loads.
179 if (GetPendingItem()) {
Eugene But (OOO till 7-30) 2017/04/05 20:12:28 Could you please avoid code duplication. Sothing l
liaoyuke 2017/04/05 20:29:40 Done.
180 GetTransientItem()->SetUserAgentType(GetPendingItem()->GetUserAgentType());
181 return;
182 }
183
184 NavigationItem* last_non_native_item = GetLastCommittedNonAppSpecificItem();
185 DCHECK(!last_non_native_item ||
186 last_non_native_item->GetUserAgentType() != UserAgentType::NONE);
187 if (last_non_native_item) {
188 GetTransientItem()->SetUserAgentType(
189 last_non_native_item->GetUserAgentType());
190 }
191 }
192
173 void NavigationManagerImpl::AddPendingItem( 193 void NavigationManagerImpl::AddPendingItem(
174 const GURL& url, 194 const GURL& url,
175 const web::Referrer& referrer, 195 const web::Referrer& referrer,
176 ui::PageTransition navigation_type, 196 ui::PageTransition navigation_type,
177 NavigationInitiationType initiation_type, 197 NavigationInitiationType initiation_type,
178 UserAgentOverrideOption user_agent_override_option) { 198 UserAgentOverrideOption user_agent_override_option) {
179 [session_controller_ addPendingItem:url 199 [session_controller_ addPendingItem:url
180 referrer:referrer 200 referrer:referrer
181 transition:navigation_type 201 transition:navigation_type
182 initiationType:initiation_type]; 202 initiationType:initiation_type];
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 const ScopedNavigationItemImplList& items = [session_controller_ items]; 478 const ScopedNavigationItemImplList& items = [session_controller_ items];
459 while (index >= 0) { 479 while (index >= 0) {
460 NavigationItem* item = items[index--].get(); 480 NavigationItem* item = items[index--].get();
461 if (!client->IsAppSpecificURL(item->GetVirtualURL())) 481 if (!client->IsAppSpecificURL(item->GetVirtualURL()))
462 return item; 482 return item;
463 } 483 }
464 return nullptr; 484 return nullptr;
465 } 485 }
466 486
467 } // namespace web 487 } // namespace web
OLDNEW
« no previous file with comments | « ios/web/navigation/navigation_manager_impl.h ('k') | ios/web/navigation/navigation_manager_impl_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698