OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 | 5 |
6 //------------------------------------------------------------------------------ | 6 //------------------------------------------------------------------------------ |
7 // Description of the life cycle of a instance of MetricsService. | 7 // Description of the life cycle of a instance of MetricsService. |
8 // | 8 // |
9 // OVERVIEW | 9 // OVERVIEW |
10 // | 10 // |
(...skipping 24 matching lines...) Expand all Loading... |
35 // INITIALIZED, // Constructor was called. | 35 // INITIALIZED, // Constructor was called. |
36 // ACTIVE, // Accumalating log data. | 36 // ACTIVE, // Accumalating log data. |
37 // STOPPED, // Service has stopped. | 37 // STOPPED, // Service has stopped. |
38 // | 38 // |
39 //----------------------------------------------------------------------------- | 39 //----------------------------------------------------------------------------- |
40 | 40 |
41 #include "chrome_frame/metrics_service.h" | 41 #include "chrome_frame/metrics_service.h" |
42 | 42 |
43 #include <atlbase.h> | 43 #include <atlbase.h> |
44 #include <atlwin.h> | 44 #include <atlwin.h> |
| 45 #include <objbase.h> |
45 #include <windows.h> | 46 #include <windows.h> |
46 #include <objbase.h> | 47 |
| 48 #include <vector> |
47 | 49 |
48 #if defined(USE_SYSTEM_LIBBZ2) | 50 #if defined(USE_SYSTEM_LIBBZ2) |
49 #include <bzlib.h> | 51 #include <bzlib.h> |
50 #else | 52 #else |
51 #include "third_party/bzip2/bzlib.h" | 53 #include "third_party/bzip2/bzlib.h" |
52 #endif | 54 #endif |
53 | 55 |
54 #include "base/file_version_info.h" | 56 #include "base/file_version_info.h" |
55 #include "base/lock.h" | 57 #include "base/lock.h" |
56 #include "base/string_split.h" | 58 #include "base/string_split.h" |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
161 ssl_config_service_ = new net::SSLConfigServiceDefaults; | 163 ssl_config_service_ = new net::SSLConfigServiceDefaults; |
162 | 164 |
163 url_security_manager_.reset( | 165 url_security_manager_.reset( |
164 net::URLSecurityManager::Create(NULL, NULL)); | 166 net::URLSecurityManager::Create(NULL, NULL)); |
165 | 167 |
166 std::string csv_auth_schemes = "basic,digest,ntlm,negotiate"; | 168 std::string csv_auth_schemes = "basic,digest,ntlm,negotiate"; |
167 std::vector<std::string> supported_schemes; | 169 std::vector<std::string> supported_schemes; |
168 base::SplitString(csv_auth_schemes, ',', &supported_schemes); | 170 base::SplitString(csv_auth_schemes, ',', &supported_schemes); |
169 | 171 |
170 http_auth_handler_factory_ = net::HttpAuthHandlerRegistryFactory::Create( | 172 http_auth_handler_factory_ = net::HttpAuthHandlerRegistryFactory::Create( |
171 supported_schemes, url_security_manager_.get(), host_resolver_, false, | 173 supported_schemes, url_security_manager_.get(), host_resolver_, |
172 false); | 174 std::string(), false, false); |
173 | 175 |
174 http_transaction_factory_ = new net::HttpCache( | 176 http_transaction_factory_ = new net::HttpCache( |
175 net::HttpNetworkLayer::CreateFactory(host_resolver_, | 177 net::HttpNetworkLayer::CreateFactory(host_resolver_, |
176 NULL /* dnsrr_resovler */, | 178 NULL /* dnsrr_resovler */, |
177 NULL /* ssl_host_info */, | 179 NULL /* ssl_host_info */, |
178 proxy_service_, | 180 proxy_service_, |
179 ssl_config_service_, | 181 ssl_config_service_, |
180 http_auth_handler_factory_, | 182 http_auth_handler_factory_, |
181 network_delegate_, | 183 network_delegate_, |
182 NULL), | 184 NULL), |
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
594 version += "-F"; | 596 version += "-F"; |
595 if (!version_info.IsOfficialBuild()) | 597 if (!version_info.IsOfficialBuild()) |
596 version.append("-devel"); | 598 version.append("-devel"); |
597 return version; | 599 return version; |
598 } else { | 600 } else { |
599 NOTREACHED() << "Unable to retrieve version string."; | 601 NOTREACHED() << "Unable to retrieve version string."; |
600 } | 602 } |
601 | 603 |
602 return std::string(); | 604 return std::string(); |
603 } | 605 } |
OLD | NEW |