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

Side by Side Diff: net/proxy/proxy_service.cc

Issue 7995: Move Time, TimeDelta and TimeTicks into namespace base. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 2 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "net/proxy/proxy_service.h" 5 #include "net/proxy/proxy_service.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <winhttp.h> 9 #include <winhttp.h>
10 #endif 10 #endif
11 11
12 #include <algorithm> 12 #include <algorithm>
13 13
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/message_loop.h" 15 #include "base/message_loop.h"
16 #include "base/string_tokenizer.h" 16 #include "base/string_tokenizer.h"
17 #include "base/string_util.h" 17 #include "base/string_util.h"
18 #include "googleurl/src/gurl.h" 18 #include "googleurl/src/gurl.h"
19 #include "net/base/net_errors.h" 19 #include "net/base/net_errors.h"
20 20
21 using base::TimeDelta;
22 using base::TimeTicks;
23
21 namespace net { 24 namespace net {
22 25
23 // ProxyConfig ---------------------------------------------------------------- 26 // ProxyConfig ----------------------------------------------------------------
24 27
25 // static 28 // static
26 ProxyConfig::ID ProxyConfig::last_id_ = ProxyConfig::INVALID_ID; 29 ProxyConfig::ID ProxyConfig::last_id_ = ProxyConfig::INVALID_ID;
27 30
28 ProxyConfig::ProxyConfig() 31 ProxyConfig::ProxyConfig()
29 : auto_detect(false), 32 : auto_detect(false),
30 id_(++last_id_) { 33 id_(++last_id_) {
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 473
471 if (MatchPattern(url_domain, bypass_url_domain)) 474 if (MatchPattern(url_domain, bypass_url_domain))
472 return true; 475 return true;
473 } 476 }
474 477
475 return false; 478 return false;
476 } 479 }
477 480
478 } // namespace net 481 } // namespace net
479 482
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698