net/base/sdch_manager.cc - Issue 670183003: Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7

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: net/base/sdch_manager.cc

Issue 670183003: Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 2 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: net/base/sdch_manager.cc

diff --git a/net/base/sdch_manager.cc b/net/base/sdch_manager.cc

index 0f31d5cee8ad84e4ea2acacd8c06a52b786847b2..2a6ef4da775f963081a7a7c9ba2602cd41ca831b 100644

--- a/net/base/sdch_manager.cc

+++ b/net/base/sdch_manager.cc

@@ -54,7 +54,12 @@ const size_t SdchManager::kMaxDictionarySize = 1000 * 1000;

bool SdchManager::g_sdch_enabled_ = true;

// static

+#if defined(OS_IOS)

+// Workaround for http://crbug.com/418975; remove when fixed.

+bool SdchManager::g_secure_scheme_supported_ = false;

+#else

bool SdchManager::g_secure_scheme_supported_ = true;

+#endif

//------------------------------------------------------------------------------

SdchManager::Dictionary::Dictionary(const std::string& dictionary_text,

« no previous file with comments | « net/base/net_util_unittest.cc ('k') | net/base/sdch_manager_unittest.cc » ('j') | no next file with comments »