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

Side by Side Diff: base/native_library_win.cc

Issue 2048523002: Fix base::GetNativeLibraryName() for Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@native_lib_clean
Patch Set: rebase Created 4 years, 6 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
« no previous file with comments | « base/native_library_unittest.cc ('k') | base/profiler/stack_sampling_profiler_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/native_library.h" 5 #include "base/native_library.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 8
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/strings/string_util.h"
10 #include "base/strings/stringprintf.h" 11 #include "base/strings/stringprintf.h"
11 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
12 #include "base/threading/thread_restrictions.h" 13 #include "base/threading/thread_restrictions.h"
13 14
14 namespace base { 15 namespace base {
15 16
16 typedef HMODULE (WINAPI* LoadLibraryFunction)(const wchar_t* file_name); 17 typedef HMODULE (WINAPI* LoadLibraryFunction)(const wchar_t* file_name);
17 18
18 namespace { 19 namespace {
19 20
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 FreeLibrary(library); 74 FreeLibrary(library);
74 } 75 }
75 76
76 // static 77 // static
77 void* GetFunctionPointerFromNativeLibrary(NativeLibrary library, 78 void* GetFunctionPointerFromNativeLibrary(NativeLibrary library,
78 StringPiece name) { 79 StringPiece name) {
79 return GetProcAddress(library, name.data()); 80 return GetProcAddress(library, name.data());
80 } 81 }
81 82
82 // static 83 // static
83 string16 GetNativeLibraryName(StringPiece16 name) { 84 std::string GetNativeLibraryName(StringPiece name) {
84 return name.as_string() + ASCIIToUTF16(".dll"); 85 DCHECK(IsStringASCII(name));
86 return name.as_string() + ".dll";
85 } 87 }
86 88
87 } // namespace base 89 } // namespace base
OLDNEW
« no previous file with comments | « base/native_library_unittest.cc ('k') | base/profiler/stack_sampling_profiler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698