OLD | NEW |
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" |
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 (cache_stats_) |
400 cache_stats_->OnCacheWaitStateChange(request, state); | 400 cache_stats_->OnRequestWaitStateChange(request, state); |
401 } | 401 } |
OLD | NEW |