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

Unified Diff: base/files/file.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/file_version_info_win.cc ('k') | base/files/file_enumerator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/files/file.h
diff --git a/base/files/file.h b/base/files/file.h
index b21b15972bce7c62be0dad659cff4e76af262ac2..1984667d23ee225c6c4c9158d72370d4e3e101b7 100644
--- a/base/files/file.h
+++ b/base/files/file.h
@@ -6,9 +6,6 @@
#define BASE_FILES_FILE_H_
#include "build/build_config.h"
-#if defined(OS_WIN)
-#include <windows.h>
-#endif
#if defined(OS_POSIX)
#include <sys/stat.h>
@@ -25,17 +22,11 @@
#include "base/move.h"
#include "base/time/time.h"
-#if defined(OS_WIN)
-#include "base/win/scoped_handle.h"
-#endif
-
FORWARD_DECLARE_TEST(FileTest, MemoryCorruption);
namespace base {
-#if defined(OS_WIN)
-typedef HANDLE PlatformFile;
-#elif defined(OS_POSIX)
+#if defined(OS_POSIX)
typedef int PlatformFile;
#if defined(OS_BSD) || defined(OS_MACOSX) || defined(OS_NACL)
@@ -293,11 +284,7 @@ class BASE_EXPORT File {
bool async() const { return async_; }
-#if defined(OS_WIN)
- static Error OSErrorToFileError(DWORD last_error);
-#elif defined(OS_POSIX)
static Error OSErrorToFileError(int saved_errno);
-#endif
// Converts an error value to a human-readable form. Used for logging.
static std::string ErrorToString(Error error);
@@ -362,11 +349,7 @@ class BASE_EXPORT File {
void SetPlatformFile(PlatformFile file);
-#if defined(OS_WIN)
- win::ScopedHandle file_;
-#elif defined(OS_POSIX)
MemoryCheckingScopedFD file_;
-#endif
// Path that |Initialize()| was called with. Only set if safe (i.e. no '..').
FilePath path_;
« no previous file with comments | « base/file_version_info_win.cc ('k') | base/files/file_enumerator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698