From 28b1110370900897ab652cb420c371fab8857ad4 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 1 Aug 2016 12:59:39 +0200 Subject: BASELINE: Update Chromium to 53.0.2785.41 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also adds a few extra files for extensions. Change-Id: Iccdd55d98660903331cf8b7b29188da781830af4 Reviewed-by: Michael Brüning --- chromium/base/files/file.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'chromium/base/files/file.h') diff --git a/chromium/base/files/file.h b/chromium/base/files/file.h index 7ab5ca58594..ae2bd1b61bd 100644 --- a/chromium/base/files/file.h +++ b/chromium/base/files/file.h @@ -13,7 +13,7 @@ #include "base/files/file_path.h" #include "base/files/file_tracing.h" #include "base/files/scoped_file.h" -#include "base/move.h" +#include "base/macros.h" #include "base/time/time.h" #include "build/build_config.h" @@ -29,10 +29,13 @@ namespace base { #if defined(OS_WIN) -typedef HANDLE PlatformFile; +using PlatformFile = HANDLE; + +const PlatformFile kInvalidPlatformFile = INVALID_HANDLE_VALUE; #elif defined(OS_POSIX) -typedef int PlatformFile; +using PlatformFile = int; +const PlatformFile kInvalidPlatformFile = -1; #if defined(OS_BSD) || defined(OS_MACOSX) || defined(OS_NACL) typedef struct stat stat_wrapper_t; #else @@ -51,8 +54,6 @@ typedef struct stat64 stat_wrapper_t; // to the OS is not considered const, even if there is no apparent change to // member variables. class BASE_EXPORT File { - MOVE_ONLY_TYPE_FOR_CPP_03(File) - public: // FLAG_(OPEN|CREATE).* are mutually exclusive. You should specify exactly one // of the five (possibly combining with other flags) when opening or creating @@ -331,6 +332,8 @@ class BASE_EXPORT File { Error error_details_; bool created_; bool async_; + + DISALLOW_COPY_AND_ASSIGN(File); }; } // namespace base -- cgit v1.2.3