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

Unified Diff: base/native_library.h

Issue 1446363003: Deleted OS_WIN and all Windows specific files from base. (Closed) Base URL: https://github.com/domokit/mojo.git@base_tests
Patch Set: Created 5 years, 1 month 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
« no previous file with comments | « base/message_loop/message_pump_win.cc ('k') | base/native_library_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/native_library.h
diff --git a/base/native_library.h b/base/native_library.h
index 1e764da89aa6846c4d5b646a301d0d28ad9de799..25383e35a9718caedf152fb49e6f598bb6cbc57f 100644
--- a/base/native_library.h
+++ b/base/native_library.h
@@ -15,9 +15,7 @@
#include "base/strings/string16.h"
#include "build/build_config.h"
-#if defined(OS_WIN)
-#include <windows.h>
-#elif defined(OS_MACOSX)
+#if defined(OS_MACOSX)
#import <CoreFoundation/CoreFoundation.h>
#endif // OS_*
@@ -25,9 +23,7 @@ namespace base {
class FilePath;
-#if defined(OS_WIN)
-typedef HMODULE NativeLibrary;
-#elif defined(OS_MACOSX)
+#if defined(OS_MACOSX)
enum NativeLibraryType {
BUNDLE,
DYNAMIC_LIB
@@ -52,18 +48,11 @@ typedef void* NativeLibrary;
#endif // OS_*
struct BASE_EXPORT NativeLibraryLoadError {
-#if defined(OS_WIN)
- NativeLibraryLoadError() : code(0) {}
-#endif // OS_WIN
// Returns a string representation of the load error.
std::string ToString() const;
-#if defined(OS_WIN)
- DWORD code;
-#else
std::string message;
-#endif // OS_WIN
};
// Loads a native library from disk. Release it with UnloadNativeLibrary when
@@ -72,16 +61,6 @@ struct BASE_EXPORT NativeLibraryLoadError {
BASE_EXPORT NativeLibrary LoadNativeLibrary(const FilePath& library_path,
NativeLibraryLoadError* error);
-#if defined(OS_WIN)
-// Loads a native library from disk. Release it with UnloadNativeLibrary when
-// you're done.
-// This function retrieves the LoadLibrary function exported from kernel32.dll
-// and calls it instead of directly calling the LoadLibrary function via the
-// import table.
-BASE_EXPORT NativeLibrary LoadNativeLibraryDynamically(
- const FilePath& library_path);
-#endif // OS_WIN
-
// Unloads a native library.
BASE_EXPORT void UnloadNativeLibrary(NativeLibrary library);
« no previous file with comments | « base/message_loop/message_pump_win.cc ('k') | base/native_library_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698