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

Side by Side Diff: chrome/browser/net/chrome_network_delegate.cc

Issue 10834313: Add histograms for network activity, and total/cumulative (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/net/chrome_network_delegate.h" 5 #include "chrome/browser/net/chrome_network_delegate.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/content_settings/cookie_settings.h" 9 #include "chrome/browser/content_settings/cookie_settings.h"
10 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 10 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
11 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 11 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
12 #include "chrome/browser/extensions/api/proxy/proxy_api.h" 12 #include "chrome/browser/extensions/api/proxy/proxy_api.h"
13 #include "chrome/browser/extensions/api/web_request/web_request_api.h" 13 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
14 #include "chrome/browser/extensions/event_router_forwarder.h" 14 #include "chrome/browser/extensions/event_router_forwarder.h"
15 #include "chrome/browser/extensions/extension_info_map.h" 15 #include "chrome/browser/extensions/extension_info_map.h"
16 #include "chrome/browser/extensions/extension_process_manager.h" 16 #include "chrome/browser/extensions/extension_process_manager.h"
17 #include "chrome/browser/net/cache_stats.h" 17 #include "chrome/browser/net/load_time_stats.h"
18 #include "chrome/browser/prefs/pref_member.h" 18 #include "chrome/browser/prefs/pref_member.h"
19 #include "chrome/browser/profiles/profile_manager.h" 19 #include "chrome/browser/profiles/profile_manager.h"
20 #include "chrome/browser/task_manager/task_manager.h" 20 #include "chrome/browser/task_manager/task_manager.h"
21 #include "chrome/common/pref_names.h" 21 #include "chrome/common/pref_names.h"
22 #include "chrome/common/url_constants.h" 22 #include "chrome/common/url_constants.h"
23 #include "content/public/browser/browser_thread.h" 23 #include "content/public/browser/browser_thread.h"
24 #include "content/public/browser/render_view_host.h" 24 #include "content/public/browser/render_view_host.h"
25 #include "content/public/browser/resource_request_info.h" 25 #include "content/public/browser/resource_request_info.h"
26 #include "net/base/host_port_pair.h" 26 #include "net/base/host_port_pair.h"
27 #include "net/base/net_errors.h" 27 #include "net/base/net_errors.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 121
122 } // namespace 122 } // namespace
123 123
124 ChromeNetworkDelegate::ChromeNetworkDelegate( 124 ChromeNetworkDelegate::ChromeNetworkDelegate(
125 extensions::EventRouterForwarder* event_router, 125 extensions::EventRouterForwarder* event_router,
126 ExtensionInfoMap* extension_info_map, 126 ExtensionInfoMap* extension_info_map,
127 const policy::URLBlacklistManager* url_blacklist_manager, 127 const policy::URLBlacklistManager* url_blacklist_manager,
128 void* profile, 128 void* profile,
129 CookieSettings* cookie_settings, 129 CookieSettings* cookie_settings,
130 BooleanPrefMember* enable_referrers, 130 BooleanPrefMember* enable_referrers,
131 chrome_browser_net::CacheStats* cache_stats) 131 chrome_browser_net::LoadTimeStats* load_time_stats)
132 : event_router_(event_router), 132 : event_router_(event_router),
133 profile_(profile), 133 profile_(profile),
134 cookie_settings_(cookie_settings), 134 cookie_settings_(cookie_settings),
135 extension_info_map_(extension_info_map), 135 extension_info_map_(extension_info_map),
136 enable_referrers_(enable_referrers), 136 enable_referrers_(enable_referrers),
137 never_throttle_requests_(false), 137 never_throttle_requests_(false),
138 url_blacklist_manager_(url_blacklist_manager), 138 url_blacklist_manager_(url_blacklist_manager),
139 cache_stats_(cache_stats) { 139 load_time_stats_(load_time_stats) {
140 DCHECK(event_router); 140 DCHECK(event_router);
141 DCHECK(enable_referrers); 141 DCHECK(enable_referrers);
142 DCHECK(!profile || cookie_settings); 142 DCHECK(!profile || cookie_settings);
143 } 143 }
144 144
145 ChromeNetworkDelegate::~ChromeNetworkDelegate() {} 145 ChromeNetworkDelegate::~ChromeNetworkDelegate() {}
146 146
147 void ChromeNetworkDelegate::NeverThrottleRequests() { 147 void ChromeNetworkDelegate::NeverThrottleRequests() {
148 never_throttle_requests_ = true; 148 never_throttle_requests_ = true;
149 } 149 }
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 socket->net_log()->AddEvent( 386 socket->net_log()->AddEvent(
387 net::NetLog::TYPE_CHROME_POLICY_ABORTED_REQUEST, 387 net::NetLog::TYPE_CHROME_POLICY_ABORTED_REQUEST,
388 net::NetLog::StringCallback("url", 388 net::NetLog::StringCallback("url",
389 &socket->url().possibly_invalid_spec())); 389 &socket->url().possibly_invalid_spec()));
390 return net::ERR_NETWORK_ACCESS_DENIED; 390 return net::ERR_NETWORK_ACCESS_DENIED;
391 } 391 }
392 #endif 392 #endif
393 return net::OK; 393 return net::OK;
394 } 394 }
395 395
396 void ChromeNetworkDelegate::OnCacheWaitStateChange( 396 void ChromeNetworkDelegate::OnRequestWaitStateChange(
397 const net::URLRequest& request, 397 const net::URLRequest& request,
398 CacheWaitState state) { 398 RequestWaitState state) {
399 if (cache_stats_) 399 if (load_time_stats_)
400 cache_stats_->OnCacheWaitStateChange(request, state); 400 load_time_stats_->OnRequestWaitStateChange(request, state);
401 } 401 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698