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

Issues Search
    My Issues | Starred     Open | Closed | All

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:
View side-by-side diff with in-line comments
Download patch
« ios/web/crw_browsing_data_store.mm ('K') | « ios/web/crw_browsing_data_store_unittest.mm ('k') | ios/web/web_state/js/crw_js_early_script_manager_unittest.mm » ('j') | ios/web/web_state/ui/wk_web_view_configuration_provider_unittest.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..f7c4b93f14b7554f4581f96fe8e40d7cf5afe9a5 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 alloc] init] autorelease]];
rohitrao (ping after 24h) 2015/06/10 16:18:22 Worth making an +emptyCache convenience method on
justincohen 2015/06/10 16:33:36 Done.
_httpProtocolDelegate.reset(new web::WebHTTPProtocolHandlerDelegate(
_browserState->GetRequestContext()));
« ios/web/crw_browsing_data_store.mm ('K') | « ios/web/crw_browsing_data_store_unittest.mm ('k') | ios/web/web_state/js/crw_js_early_script_manager_unittest.mm » ('j') | ios/web/web_state/ui/wk_web_view_configuration_provider_unittest.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698