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

Unified Diff: net/proxy/proxy_service.cc

Issue 1059843002: Refactor NetLog::LogLevel --> NetLogCaptureMode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again to fix a merge conflict Created 5 years, 8 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/proxy/proxy_script_decider.cc ('k') | net/quic/quic_client_session.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_service.cc
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index f912d2e91432265d432d6b1d82558156fd0a99ac..7de5449976112bcb138f6c34ee6167a11a544a6b 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -316,7 +316,7 @@ class ProxyResolverFactoryForPacResult : public ProxyResolverFactory {
base::Value* NetLogProxyConfigChangedCallback(
const ProxyConfig* old_config,
const ProxyConfig* new_config,
- NetLog::LogLevel /* log_level */) {
+ NetLogCaptureMode /* capture_mode */) {
base::DictionaryValue* dict = new base::DictionaryValue();
// The "old_config" is optional -- the first notification will not have
// any "previous" configuration.
@@ -327,7 +327,7 @@ base::Value* NetLogProxyConfigChangedCallback(
}
base::Value* NetLogBadProxyListCallback(const ProxyRetryInfoMap* retry_info,
- NetLog::LogLevel /* log_level */) {
+ NetLogCaptureMode /* capture_mode */) {
base::DictionaryValue* dict = new base::DictionaryValue();
base::ListValue* list = new base::ListValue();
@@ -342,7 +342,7 @@ base::Value* NetLogBadProxyListCallback(const ProxyRetryInfoMap* retry_info,
// Returns NetLog parameters on a successfuly proxy resolution.
base::Value* NetLogFinishedResolvingProxyCallback(
const ProxyInfo* result,
- NetLog::LogLevel /* log_level */) {
+ NetLogCaptureMode /* capture_mode */) {
base::DictionaryValue* dict = new base::DictionaryValue();
dict->SetString("pac_string", result->ToPacString());
return dict;
@@ -1389,7 +1389,7 @@ int ProxyService::DidFinishResolvingProxy(const GURL& url,
network_delegate->NotifyResolveProxy(url, load_flags, *this, result);
// When logging all events is enabled, dump the proxy list.
- if (net_log.IsLogging()) {
+ if (net_log.GetCaptureMode().enabled()) {
net_log.AddEvent(
NetLog::TYPE_PROXY_SERVICE_RESOLVED_PROXY_LIST,
base::Bind(&NetLogFinishedResolvingProxyCallback, result));
« no previous file with comments | « net/proxy/proxy_script_decider.cc ('k') | net/quic/quic_client_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698