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

Unified Diff: ios/web/web_state/ui/crw_web_controller.mm

Issue 2705293014: Created web::UserAgentType. (Closed)
Patch Set: fix GetLastCommittedWebItem Created 3 years, 10 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/web/web_state/ui/crw_web_controller.mm
diff --git a/ios/web/web_state/ui/crw_web_controller.mm b/ios/web/web_state/ui/crw_web_controller.mm
index 3564aabbfe50277e7ea23904b89f5f683b6b3132..bcc78f29d74eaaa34af7b7f863eed073f3b514e3 100644
--- a/ios/web/web_state/ui/crw_web_controller.mm
+++ b/ios/web/web_state/ui/crw_web_controller.mm
@@ -2351,7 +2351,7 @@ - (BOOL)shouldClosePageOnNativeApplicationLoad {
- (BOOL)usesDesktopUserAgent {
web::NavigationItem* item = [self currentNavItem];
- return item && item->IsOverridingUserAgent();
+ return item && item->GetUserAgentType() == web::UserAgentType::DESKTOP;
}
- (web::MojoFacade*)mojoFacade {
@@ -2403,10 +2403,8 @@ - (void)updateDesktopUserAgentForEntry:(CRWSessionEntry*)entry
web::NavigationItemImpl* fromItem = fromEntry.navigationItemImpl;
if (!item || !fromItem)
return;
- bool useDesktopUserAgent = item->IsOverridingUserAgent();
- if (useDesktopUserAgent != fromItem->IsOverridingUserAgent()) {
+ if (item->GetUserAgentType() != fromItem->GetUserAgentType())
Eugene But (OOO till 7-30) 2017/02/25 01:51:52 If new UA is NONE, then page reconstruction is unn
kkhorimoto 2017/02/27 23:29:04 Done.
[self requirePageReconstruction];
- }
}
#pragma mark -

Powered by Google App Engine
This is Rietveld 408576698