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

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: Requested changes + separation for disk/network reads 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/api/prefs/pref_member.h" 8 #include "chrome/browser/api/prefs/pref_member.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/content_settings/cookie_settings.h" 10 #include "chrome/browser/content_settings/cookie_settings.h"
11 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 11 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
12 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 12 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
13 #include "chrome/browser/extensions/api/proxy/proxy_api.h" 13 #include "chrome/browser/extensions/api/proxy/proxy_api.h"
14 #include "chrome/browser/extensions/api/web_request/web_request_api.h" 14 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
15 #include "chrome/browser/extensions/event_router_forwarder.h" 15 #include "chrome/browser/extensions/event_router_forwarder.h"
16 #include "chrome/browser/extensions/extension_info_map.h" 16 #include "chrome/browser/extensions/extension_info_map.h"
17 #include "chrome/browser/extensions/extension_process_manager.h" 17 #include "chrome/browser/extensions/extension_process_manager.h"
18 #include "chrome/browser/net/load_time_stats.h" 18 #include "chrome/browser/net/load_time_stats.h"
19 #include "chrome/browser/performance_monitor/performance_monitor.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"
28 #include "net/base/net_log.h" 29 #include "net/base/net_log.h"
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 241
241 242
242 void ChromeNetworkDelegate::OnResponseStarted(net::URLRequest* request) { 243 void ChromeNetworkDelegate::OnResponseStarted(net::URLRequest* request) {
243 ExtensionWebRequestEventRouter::GetInstance()->OnResponseStarted( 244 ExtensionWebRequestEventRouter::GetInstance()->OnResponseStarted(
244 profile_, extension_info_map_.get(), request); 245 profile_, extension_info_map_.get(), request);
245 ForwardProxyErrors(request, event_router_.get(), profile_); 246 ForwardProxyErrors(request, event_router_.get(), profile_);
246 } 247 }
247 248
248 void ChromeNetworkDelegate::OnRawBytesRead(const net::URLRequest& request, 249 void ChromeNetworkDelegate::OnRawBytesRead(const net::URLRequest& request,
249 int bytes_read) { 250 int bytes_read) {
251 if (performance_monitor::PerformanceMonitor::initialized()) {
252 performance_monitor::PerformanceMonitor::GetInstance()->BytesRead(
253 request, bytes_read);
254 }
250 #if defined(ENABLE_TASK_MANAGER) 255 #if defined(ENABLE_TASK_MANAGER)
251 TaskManager::GetInstance()->model()->NotifyBytesRead(request, bytes_read); 256 TaskManager::GetInstance()->model()->NotifyBytesRead(request, bytes_read);
252 #endif // defined(ENABLE_TASK_MANAGER) 257 #endif // defined(ENABLE_TASK_MANAGER)
253 } 258 }
254 259
255 void ChromeNetworkDelegate::OnCompleted(net::URLRequest* request, 260 void ChromeNetworkDelegate::OnCompleted(net::URLRequest* request,
256 bool started) { 261 bool started) {
257 if (request->status().status() == net::URLRequestStatus::SUCCESS || 262 if (request->status().status() == net::URLRequestStatus::SUCCESS ||
258 request->status().status() == net::URLRequestStatus::HANDLED_EXTERNALLY) { 263 request->status().status() == net::URLRequestStatus::HANDLED_EXTERNALLY) {
259 bool is_redirect = request->response_headers() && 264 bool is_redirect = request->response_headers() &&
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 #endif 415 #endif
411 return net::OK; 416 return net::OK;
412 } 417 }
413 418
414 void ChromeNetworkDelegate::OnRequestWaitStateChange( 419 void ChromeNetworkDelegate::OnRequestWaitStateChange(
415 const net::URLRequest& request, 420 const net::URLRequest& request,
416 RequestWaitState state) { 421 RequestWaitState state) {
417 if (load_time_stats_) 422 if (load_time_stats_)
418 load_time_stats_->OnRequestWaitStateChange(request, state); 423 load_time_stats_->OnRequestWaitStateChange(request, state);
419 } 424 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698