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

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

Issue 10829342: Add BytesRead metric to CPM (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
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
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/cache_stats.h"
18 #include "chrome/browser/performance_monitor/performance_monitor.h"
18 #include "chrome/browser/prefs/pref_member.h" 19 #include "chrome/browser/prefs/pref_member.h"
19 #include "chrome/browser/profiles/profile_manager.h" 20 #include "chrome/browser/profiles/profile_manager.h"
20 #include "chrome/browser/task_manager/task_manager.h" 21 #include "chrome/browser/task_manager/task_manager.h"
21 #include "chrome/common/pref_names.h" 22 #include "chrome/common/pref_names.h"
22 #include "chrome/common/url_constants.h" 23 #include "chrome/common/url_constants.h"
23 #include "content/public/browser/browser_thread.h" 24 #include "content/public/browser/browser_thread.h"
24 #include "content/public/browser/render_view_host.h" 25 #include "content/public/browser/render_view_host.h"
25 #include "content/public/browser/resource_request_info.h" 26 #include "content/public/browser/resource_request_info.h"
26 #include "net/base/host_port_pair.h" 27 #include "net/base/host_port_pair.h"
27 #include "net/base/net_errors.h" 28 #include "net/base/net_errors.h"
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 227
227 228
228 void ChromeNetworkDelegate::OnResponseStarted(net::URLRequest* request) { 229 void ChromeNetworkDelegate::OnResponseStarted(net::URLRequest* request) {
229 ExtensionWebRequestEventRouter::GetInstance()->OnResponseStarted( 230 ExtensionWebRequestEventRouter::GetInstance()->OnResponseStarted(
230 profile_, extension_info_map_.get(), request); 231 profile_, extension_info_map_.get(), request);
231 ForwardProxyErrors(request, event_router_.get(), profile_); 232 ForwardProxyErrors(request, event_router_.get(), profile_);
232 } 233 }
233 234
234 void ChromeNetworkDelegate::OnRawBytesRead(const net::URLRequest& request, 235 void ChromeNetworkDelegate::OnRawBytesRead(const net::URLRequest& request,
235 int bytes_read) { 236 int bytes_read) {
237 if (performance_monitor::PerformanceMonitor::enabled()) {
238 performance_monitor::PerformanceMonitor::GetInstance()->BytesRead(
239 bytes_read);
battre 2012/08/21 16:16:04 OnRawBytesRead is called on the IO thread. In Perf
Devlin 2012/08/21 19:46:46 See comment in performance_monitor.cc
240 }
236 #if defined(ENABLE_TASK_MANAGER) 241 #if defined(ENABLE_TASK_MANAGER)
237 TaskManager::GetInstance()->model()->NotifyBytesRead(request, bytes_read); 242 TaskManager::GetInstance()->model()->NotifyBytesRead(request, bytes_read);
238 #endif // defined(ENABLE_TASK_MANAGER) 243 #endif // defined(ENABLE_TASK_MANAGER)
239 } 244 }
240 245
241 void ChromeNetworkDelegate::OnCompleted(net::URLRequest* request, 246 void ChromeNetworkDelegate::OnCompleted(net::URLRequest* request,
242 bool started) { 247 bool started) {
243 if (request->status().status() == net::URLRequestStatus::SUCCESS || 248 if (request->status().status() == net::URLRequestStatus::SUCCESS ||
244 request->status().status() == net::URLRequestStatus::HANDLED_EXTERNALLY) { 249 request->status().status() == net::URLRequestStatus::HANDLED_EXTERNALLY) {
245 bool is_redirect = request->response_headers() && 250 bool is_redirect = request->response_headers() &&
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 #endif 401 #endif
397 return net::OK; 402 return net::OK;
398 } 403 }
399 404
400 void ChromeNetworkDelegate::OnCacheWaitStateChange( 405 void ChromeNetworkDelegate::OnCacheWaitStateChange(
401 const net::URLRequest& request, 406 const net::URLRequest& request,
402 CacheWaitState state) { 407 CacheWaitState state) {
403 if (cache_stats_) 408 if (cache_stats_)
404 cache_stats_->OnCacheWaitStateChange(request, state); 409 cache_stats_->OnCacheWaitStateChange(request, state);
405 } 410 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698