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

Unified Diff: ios/chrome/browser/tabs/tab.mm

Issue 2779263002: Set user agent type of transient item the same as pending item. (Closed)
Patch Set: removed unused includes Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: ios/chrome/browser/tabs/tab.mm
diff --git a/ios/chrome/browser/tabs/tab.mm b/ios/chrome/browser/tabs/tab.mm
index b5e12d3765c2add415dff86d912e2a3beaf136a6..c709909a13791a84955f36205153827c4ba6b21f 100644
--- a/ios/chrome/browser/tabs/tab.mm
+++ b/ios/chrome/browser/tabs/tab.mm
@@ -1479,9 +1479,15 @@ - (BOOL)usesDesktopUserAgent {
if (!self.navigationManager)
return NO;
- web::NavigationItem* visibleItem = self.navigationManager->GetVisibleItem();
- return visibleItem &&
- visibleItem->GetUserAgentType() == web::UserAgentType::DESKTOP;
+ web::NavigationItem* item = nullptr;
Eugene But (OOO till 7-30) 2017/03/30 23:01:49 How about this?: web::NavigationItem* item = self
liaoyuke 2017/03/31 15:50:12 Done.
+ if (self.navigationManager->GetTransientItem())
+ item = self.navigationManager->GetTransientItem();
+ else if (self.navigationManager->GetPendingItem())
+ item = self.navigationManager->GetPendingItem();
+ else if (self.navigationManager->GetLastCommittedItem())
+ item = self.navigationManager->GetLastCommittedItem();
+
+ return item && item->GetUserAgentType() == web::UserAgentType::DESKTOP;
}
- (void)enableDesktopUserAgent {
« no previous file with comments | « no previous file | ios/chrome/browser/ui/browser_view_controller.mm » ('j') | ios/chrome/browser/ui/browser_view_controller.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698