ios/web/shell/view_controller.mm - Issue 1171203004: Correct iOS build for latest Xcode beta.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ios/web/shell/view_controller.mm

Issue 1171203004: Correct iOS build for latest Xcode beta. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Nits Created 5 years, 6 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:

Index: ios/web/shell/view_controller.mm

diff --git a/ios/web/shell/view_controller.mm b/ios/web/shell/view_controller.mm

index 16e78fe72955d84dc38ffc0b678983e3e20f934d..fc7d52b9498266b33642c6d76043be4466fb8519 100644

--- a/ios/web/shell/view_controller.mm

+++ b/ios/web/shell/view_controller.mm

@@ -10,6 +10,7 @@

#include "base/strings/sys_string_conversions.h"

#include "ios/net/cookies/cookie_store_ios.h"

#import "ios/net/crn_http_protocol_handler.h"

+#import "ios/net/empty_nsurlcache.h"

#import "ios/web/navigation/crw_session_controller.h"

#include "ios/web/navigation/web_load_params.h"

#import "ios/web/net/crw_url_verifying_protocol_handler.h"

@@ -130,7 +131,7 @@ bool UseWKWebView() {

- (void)setUpNetworkStack {

// Disable the default cache.

- [NSURLCache setSharedURLCache:nil];

+ [NSURLCache setSharedURLCache:[EmptyNSURLCache emptyNSURLCache]];

_httpProtocolDelegate.reset(new web::WebHTTPProtocolHandlerDelegate(

_browserState->GetRequestContext()));