ios/crnet/CrNet.mm - Issue 1979313002: Added crnet_framework target to build CrNet dynamic framework.

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/crnet/CrNet.mm

Issue 1979313002: Added crnet_framework target to build CrNet dynamic framework. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address Andrei's comments. Created 4 years, 7 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/crnet/CrNet.mm

diff --git a/ios/crnet/CrNet.mm b/ios/crnet/CrNet.mm

index 0347344491698e5cc026845f2628dd3fe3363d0a..72cee6e76a24ff1fa131f1978b4ce7e73dbc17ce 100644

--- a/ios/crnet/CrNet.mm

+++ b/ios/crnet/CrNet.mm

@@ -11,7 +11,7 @@

static CrNetEnvironment* g_chrome_net = NULL;

-static BOOL g_spdy_enabled = YES;

+static BOOL g_http2_enabled = YES;

static BOOL g_quic_enabled = NO;

static BOOL g_sdch_enabled = NO;

static NSString* g_user_agent = nil;

@@ -20,8 +20,8 @@ static RequestFilterBlock g_request_filter_block = nil;

@implementation CrNet

-+ (void)setSpdyEnabled:(BOOL)spdyEnabled {

- g_spdy_enabled = spdyEnabled;

++ (void)setHttp2Enabled:(BOOL)http2Enabled {

+ g_http2_enabled = http2Enabled;

}

+ (void)setQuicEnabled:(BOOL)quicEnabled {

@@ -43,7 +43,7 @@ static RequestFilterBlock g_request_filter_block = nil;

std::string partial_user_agent = base::SysNSStringToUTF8(g_user_agent);

g_chrome_net = new CrNetEnvironment(partial_user_agent);

- g_chrome_net->set_spdy_enabled(g_spdy_enabled);

+ g_chrome_net->set_spdy_enabled(g_http2_enabled);

g_chrome_net->set_quic_enabled(g_quic_enabled);

g_chrome_net->set_sdch_enabled(g_sdch_enabled);

if (g_sdch_pref_store_filename) {

« no previous file with comments | « ios/crnet/CrNet.h ('k') | ios/crnet/Info.plist » ('j') | no next file with comments »