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

Unified Diff: chrome/browser/prefs/command_line_pref_store.cc

Issue 1320533007: Componentize ssl_config_service_manager_pref.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolve -Wnewline-eof mac_chromium bot failure Created 5 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
Index: chrome/browser/prefs/command_line_pref_store.cc
diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc
index c6e9b12cd6143e1d1bd116f5ff05846b48837438..460cf2ccbab72ddc8cafb17e3066249152142705 100644
--- a/chrome/browser/prefs/command_line_pref_store.cc
+++ b/chrome/browser/prefs/command_line_pref_store.cc
@@ -19,6 +19,8 @@
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
#include "components/proxy_config/proxy_config_dictionary.h"
#include "components/proxy_config/proxy_config_pref_names.h"
+#include "components/ssl_config/ssl_config_prefs.h"
+#include "components/ssl_config/ssl_config_switches.h"
#include "content/public/common/content_switches.h"
#include "ui/base/ui_base_switches.h"
@@ -32,9 +34,10 @@ const CommandLinePrefStore::StringSwitchToPreferenceMapEntry
{ data_reduction_proxy::switches::kDataReductionProxy,
data_reduction_proxy::prefs::kDataReductionProxy },
{ switches::kAuthServerWhitelist, prefs::kAuthServerWhitelist },
- { switches::kSSLVersionMin, prefs::kSSLVersionMin },
- { switches::kSSLVersionMax, prefs::kSSLVersionMax },
- { switches::kSSLVersionFallbackMin, prefs::kSSLVersionFallbackMin },
+ { switches::kSSLVersionMin, ssl_config::prefs::kSSLVersionMin },
+ { switches::kSSLVersionMax, ssl_config::prefs::kSSLVersionMax },
+ { switches::kSSLVersionFallbackMin,
+ ssl_config::prefs::kSSLVersionFallbackMin },
#if defined(OS_ANDROID)
{ switches::kAuthAndroidNegotiateAccountType,
prefs::kAuthAndroidNegotiateAccountType },
@@ -187,7 +190,7 @@ void CommandLinePrefStore::ApplySSLSwitches() {
list_value->AppendStrings(base::SplitString(
command_line_->GetSwitchValueASCII(switches::kCipherSuiteBlacklist),
",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL));
- SetValue(prefs::kCipherSuiteBlacklist, list_value.Pass(),
+ SetValue(ssl_config::prefs::kCipherSuiteBlacklist, list_value.Pass(),
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
}
}
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/prefs/command_line_pref_store_ssl_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698