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

Side by Side Diff: base/native_library_win.cc

Issue 6864020: linux: don't always print dlopen errors from LoadNativeLibrary (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: owners Created 9 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « base/native_library_mac.mm ('k') | chrome/common/pepper_plugin_registry.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) 2009 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/file_util.h" 9 #include "base/file_util.h"
10 #include "base/threading/thread_restrictions.h" 10 #include "base/threading/thread_restrictions.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
(...skipping 20 matching lines...) Expand all
32 } 32 }
33 33
34 HMODULE module = (*load_library_api)(library_path.value().c_str()); 34 HMODULE module = (*load_library_api)(library_path.value().c_str());
35 if (restore_directory) 35 if (restore_directory)
36 file_util::SetCurrentDirectory(current_directory); 36 file_util::SetCurrentDirectory(current_directory);
37 37
38 return module; 38 return module;
39 } 39 }
40 40
41 // static 41 // static
42 NativeLibrary LoadNativeLibrary(const FilePath& library_path) { 42 NativeLibrary LoadNativeLibrary(const FilePath& library_path,
43 std::string* error) {
43 return LoadNativeLibraryHelper(library_path, LoadLibraryW); 44 return LoadNativeLibraryHelper(library_path, LoadLibraryW);
44 } 45 }
45 46
46 NativeLibrary LoadNativeLibraryDynamically(const FilePath& library_path) { 47 NativeLibrary LoadNativeLibraryDynamically(const FilePath& library_path) {
47 typedef HMODULE (WINAPI* LoadLibraryFunction)(const wchar_t* file_name); 48 typedef HMODULE (WINAPI* LoadLibraryFunction)(const wchar_t* file_name);
48 49
49 LoadLibraryFunction load_library; 50 LoadLibraryFunction load_library;
50 load_library = reinterpret_cast<LoadLibraryFunction>( 51 load_library = reinterpret_cast<LoadLibraryFunction>(
51 GetProcAddress(GetModuleHandle(L"kernel32.dll"), "LoadLibraryW")); 52 GetProcAddress(GetModuleHandle(L"kernel32.dll"), "LoadLibraryW"));
52 53
(...skipping 10 matching lines...) Expand all
63 const char* name) { 64 const char* name) {
64 return GetProcAddress(library, name); 65 return GetProcAddress(library, name);
65 } 66 }
66 67
67 // static 68 // static
68 string16 GetNativeLibraryName(const string16& name) { 69 string16 GetNativeLibraryName(const string16& name) {
69 return name + ASCIIToUTF16(".dll"); 70 return name + ASCIIToUTF16(".dll");
70 } 71 }
71 72
72 } // namespace base 73 } // namespace base
OLDNEW
« no previous file with comments | « base/native_library_mac.mm ('k') | chrome/common/pepper_plugin_registry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698