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_frame/http_negotiate.h" | 5 #include "chrome_frame/http_negotiate.h" |
6 | 6 |
7 #include <atlbase.h> | 7 #include <atlbase.h> |
8 #include <atlcom.h> | 8 #include <atlcom.h> |
9 #include <htiframe.h> | 9 #include <htiframe.h> |
10 | 10 |
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
274 http_utils::GetChromeUserAgent()); | 274 http_utils::GetChromeUserAgent()); |
275 } else if (ShouldRemoveUAForUrl(url)) { | 275 } else if (ShouldRemoveUAForUrl(url)) { |
276 updated_headers = RemoveCFUserAgentString(headers, *additional_headers); | 276 updated_headers = RemoveCFUserAgentString(headers, *additional_headers); |
277 } else { | 277 } else { |
278 updated_headers = AppendCFUserAgentString(headers, *additional_headers); | 278 updated_headers = AppendCFUserAgentString(headers, *additional_headers); |
279 } | 279 } |
280 | 280 |
281 *additional_headers = reinterpret_cast<wchar_t*>(::CoTaskMemRealloc( | 281 *additional_headers = reinterpret_cast<wchar_t*>(::CoTaskMemRealloc( |
282 *additional_headers, | 282 *additional_headers, |
283 (updated_headers.length() + 1) * sizeof(wchar_t))); | 283 (updated_headers.length() + 1) * sizeof(wchar_t))); |
284 lstrcpyW(*additional_headers, ASCIIToWide(updated_headers).c_str()); | 284 lstrcpyW(*additional_headers, base::ASCIIToWide(updated_headers).c_str()); |
285 } else { | 285 } else { |
286 // TODO(erikwright): Remove the user agent if it is present (i.e., because | 286 // TODO(erikwright): Remove the user agent if it is present (i.e., because |
287 // of PostPlatform setting in the registry). | 287 // of PostPlatform setting in the registry). |
288 } | 288 } |
289 return S_OK; | 289 return S_OK; |
290 } | 290 } |
OLD | NEW |