diff options
Diffstat (limited to 'chromium/base/native_library.h')
| -rw-r--r-- | chromium/base/native_library.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chromium/base/native_library.h b/chromium/base/native_library.h index 1e764da89aa..b4f3a3cd1ba 100644 --- a/chromium/base/native_library.h +++ b/chromium/base/native_library.h @@ -11,8 +11,7 @@ #include <string> #include "base/base_export.h" -#include "base/compiler_specific.h" -#include "base/strings/string16.h" +#include "base/strings/string_piece.h" #include "build/build_config.h" #if defined(OS_WIN) @@ -26,7 +25,7 @@ namespace base { class FilePath; #if defined(OS_WIN) -typedef HMODULE NativeLibrary; +using NativeLibrary = HMODULE; #elif defined(OS_MACOSX) enum NativeLibraryType { BUNDLE, @@ -46,9 +45,9 @@ struct NativeLibraryStruct { void* dylib; }; }; -typedef NativeLibraryStruct* NativeLibrary; +using NativeLibrary = NativeLibraryStruct*; #elif defined(OS_POSIX) -typedef void* NativeLibrary; +using NativeLibrary = void*; #endif // OS_* struct BASE_EXPORT NativeLibraryLoadError { @@ -87,13 +86,14 @@ BASE_EXPORT void UnloadNativeLibrary(NativeLibrary library); // Gets a function pointer from a native library. BASE_EXPORT void* GetFunctionPointerFromNativeLibrary(NativeLibrary library, - const char* name); + StringPiece name); // Returns the full platform specific name for a native library. +// |name| must be ASCII. // For example: // "mylib" returns "mylib.dll" on Windows, "libmylib.so" on Linux, -// "mylib.dylib" on Mac. -BASE_EXPORT string16 GetNativeLibraryName(const string16& name); +// "libmylib.dylib" on Mac. +BASE_EXPORT std::string GetNativeLibraryName(StringPiece name); } // namespace base |