diff options
author | dsh@google.com <dsh@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-27 20:43:33 +0000 |
---|---|---|
committer | dsh@google.com <dsh@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-27 20:43:33 +0000 |
commit | e1acf6f902e50222baf99bfb492ecc38a1604975 (patch) | |
tree | 503d45705b14be7e2f1ed86c71d6064abbf90fbe /net/proxy | |
parent | a2f5993e1ce940e8a8eec900abaeed02e2eee09b (diff) | |
download | chromium_src-e1acf6f902e50222baf99bfb492ecc38a1604975.zip chromium_src-e1acf6f902e50222baf99bfb492ecc38a1604975.tar.gz chromium_src-e1acf6f902e50222baf99bfb492ecc38a1604975.tar.bz2 |
Move Time, TimeDelta and TimeTicks into namespace base.
Review URL: http://codereview.chromium.org/7995
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4022 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
-rw-r--r-- | net/proxy/proxy_resolver_winhttp.cc | 3 | ||||
-rw-r--r-- | net/proxy/proxy_service.cc | 3 | ||||
-rw-r--r-- | net/proxy/proxy_service.h | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/net/proxy/proxy_resolver_winhttp.cc b/net/proxy/proxy_resolver_winhttp.cc index 2a12e06..5a16df5 100644 --- a/net/proxy/proxy_resolver_winhttp.cc +++ b/net/proxy/proxy_resolver_winhttp.cc @@ -12,6 +12,9 @@ #pragma comment(lib, "winhttp.lib") +using base::TimeDelta; +using base::TimeTicks; + namespace net { // A small wrapper for histogramming purposes ;-) diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc index be11692..52d8491 100644 --- a/net/proxy/proxy_service.cc +++ b/net/proxy/proxy_service.cc @@ -18,6 +18,9 @@ #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" +using base::TimeDelta; +using base::TimeTicks; + namespace net { // ProxyConfig ---------------------------------------------------------------- diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h index 5ca41e8..c596aab 100644 --- a/net/proxy/proxy_service.h +++ b/net/proxy/proxy_service.h @@ -65,11 +65,11 @@ class ProxyConfig { // Contains the information about when to retry a proxy server. struct ProxyRetryInfo { // We should not retry until this time. - TimeTicks bad_until; + base::TimeTicks bad_until; // This is the current delay. If the proxy is still bad, we need to increase // this delay. - TimeDelta current_delay; + base::TimeDelta current_delay; }; // Map of proxy servers with the associated RetryInfo structures. @@ -161,7 +161,7 @@ class ProxyService { bool config_is_bad_; // The time when the proxy configuration was last read from the system. - TimeTicks config_last_update_time_; + base::TimeTicks config_last_update_time_; // Map of the known bad proxies and the information about the retry time. ProxyRetryInfoMap proxy_retry_info_; |