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

Side by Side Diff: webrtc/system_wrappers/include/utf_util_win.h

Issue 1942823002: Remove webrtc/base/scoped_ptr.h (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: fix additional scoped_ptr uses that had been added Created 4 years, 7 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 // Conversion functions for UTF-8 and UTF-16 strings on Windows. 11 // Conversion functions for UTF-8 and UTF-16 strings on Windows.
12 // Duplicated from talk/base/win32.h. 12 // Duplicated from talk/base/win32.h.
13 #ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_UTF_UTIL_H_ 13 #ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_UTF_UTIL_H_
14 #define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_UTF_UTIL_H_ 14 #define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_UTF_UTIL_H_
15 15
16 #ifdef WIN32 16 #ifdef WIN32
17 #include <windows.h> 17 #include <windows.h>
18 18
19 #include <memory> 19 #include <memory>
20 #include <string> 20 #include <string>
21 21
22 #include "webrtc/base/scoped_ptr.h"
23 22
24 namespace webrtc { 23 namespace webrtc {
25 24
26 inline std::wstring ToUtf16(const char* utf8, size_t len) { 25 inline std::wstring ToUtf16(const char* utf8, size_t len) {
27 int len16 = ::MultiByteToWideChar(CP_UTF8, 0, utf8, static_cast<int>(len), 26 int len16 = ::MultiByteToWideChar(CP_UTF8, 0, utf8, static_cast<int>(len),
28 NULL, 0); 27 NULL, 0);
29 std::unique_ptr<wchar_t[]> ws(new wchar_t[len16]); 28 std::unique_ptr<wchar_t[]> ws(new wchar_t[len16]);
30 ::MultiByteToWideChar(CP_UTF8, 0, utf8, static_cast<int>(len), ws.get(), 29 ::MultiByteToWideChar(CP_UTF8, 0, utf8, static_cast<int>(len), ws.get(),
31 len16); 30 len16);
32 return std::wstring(ws.get(), len16); 31 return std::wstring(ws.get(), len16);
(...skipping 17 matching lines...) Expand all
50 } 49 }
51 50
52 inline std::string ToUtf8(const std::wstring& wstr) { 51 inline std::string ToUtf8(const std::wstring& wstr) {
53 return ToUtf8(wstr.data(), wstr.length()); 52 return ToUtf8(wstr.data(), wstr.length());
54 } 53 }
55 54
56 } // namespace webrtc 55 } // namespace webrtc
57 56
58 #endif // WIN32 57 #endif // WIN32
59 #endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_UTF_UTIL_H_ 58 #endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_UTF_UTIL_H_
OLDNEW
« no previous file with comments | « webrtc/system_wrappers/include/data_log_impl.h ('k') | webrtc/system_wrappers/source/file_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698