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

Unified Diff: net/base/sdch_manager.cc

Issue 683113005: Update from chromium https://crrev.com/302282 (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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/proxy_delegate.h ('k') | net/base/sdch_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/sdch_manager.cc
diff --git a/net/base/sdch_manager.cc b/net/base/sdch_manager.cc
index 2a6ef4da775f963081a7a7c9ba2602cd41ca831b..122f01ff644630188a39e2c8ccd4f8bbe969e4aa 100644
--- a/net/base/sdch_manager.cc
+++ b/net/base/sdch_manager.cc
@@ -51,16 +51,16 @@ const size_t SdchManager::kMaxDictionarySize = 1000 * 1000;
#endif
// static
-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;
+bool SdchManager::g_sdch_enabled_ = false;
#else
-bool SdchManager::g_secure_scheme_supported_ = true;
+bool SdchManager::g_sdch_enabled_ = true;
#endif
+// static
+bool SdchManager::g_secure_scheme_supported_ = true;
+
//------------------------------------------------------------------------------
SdchManager::Dictionary::Dictionary(const std::string& dictionary_text,
size_t offset,
« no previous file with comments | « net/base/proxy_delegate.h ('k') | net/base/sdch_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698