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

Unified Diff: base/native_library_win.cc

Issue 206713004: Report PPAPI plugin load error code to UMA. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use std::string directly. Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: base/native_library_win.cc
diff --git a/base/native_library_win.cc b/base/native_library_win.cc
index bcea485a1d10582016622738f1081fde471cd567..6ac9e324456bf451abeb0ed12d2c2ccabb05cf6f 100644
--- a/base/native_library_win.cc
+++ b/base/native_library_win.cc
@@ -15,9 +15,11 @@ namespace base {
typedef HMODULE (WINAPI* LoadLibraryFunction)(const wchar_t* file_name);
+namespace {
+
NativeLibrary LoadNativeLibraryHelper(const FilePath& library_path,
LoadLibraryFunction load_library_api,
- std::string* error) {
+ NativeLibraryLoadError* error) {
// LoadLibrary() opens the file off disk.
ThreadRestrictions::AssertIOAllowed();
@@ -36,8 +38,7 @@ NativeLibrary LoadNativeLibraryHelper(const FilePath& library_path,
HMODULE module = (*load_library_api)(library_path.value().c_str());
if (!module && error) {
// GetLastError() needs to be called immediately after |load_library_api|.
- DWORD last_error = GetLastError();
- *error = StringPrintf("%u", last_error);
+ *error = GetLastError();
}
if (restore_directory)
@@ -46,9 +47,11 @@ NativeLibrary LoadNativeLibraryHelper(const FilePath& library_path,
return module;
}
+} // namespace
+
// static
NativeLibrary LoadNativeLibrary(const FilePath& library_path,
- std::string* error) {
+ NativeLibraryLoadError* error) {
return LoadNativeLibraryHelper(library_path, LoadLibraryW, error);
}
@@ -59,7 +62,7 @@ NativeLibrary LoadNativeLibraryDynamically(const FilePath& library_path) {
load_library = reinterpret_cast<LoadLibraryFunction>(
GetProcAddress(GetModuleHandle(L"kernel32.dll"), "LoadLibraryW"));
- return LoadNativeLibraryHelper(library_path, load_library, NULL);
+ return LoadNativeLibraryHelper(library_path, load_library, NULL, NULL);
}
// static

Powered by Google App Engine
This is Rietveld 408576698