Index: ppapi/cpp/file_ref.h |
=================================================================== |
--- ppapi/cpp/file_ref.h (revision 89748) |
+++ ppapi/cpp/file_ref.h (working copy) |
@@ -1,41 +1,41 @@ |
-// Copyright (c) 2010 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef PPAPI_CPP_DEV_FILE_REF_DEV_H_ |
-#define PPAPI_CPP_DEV_FILE_REF_DEV_H_ |
+#ifndef PPAPI_CPP_FILE_REF_H_ |
+#define PPAPI_CPP_FILE_REF_H_ |
-#include "ppapi/c/dev/ppb_file_ref_dev.h" |
#include "ppapi/c/pp_stdint.h" |
+#include "ppapi/c/ppb_file_ref.h" |
#include "ppapi/cpp/resource.h" |
#include "ppapi/cpp/var.h" |
namespace pp { |
class CompletionCallback; |
-class FileSystem_Dev; |
+class FileSystem; |
-class FileRef_Dev : public Resource { |
+class FileRef: public Resource { |
public: |
// Creates an is_null() FileRef object. |
- FileRef_Dev() {} |
+ FileRef() {} |
// This constructor is used when we've gotten a PP_Resource as a return value |
// that we need to addref. |
- explicit FileRef_Dev(PP_Resource resource); |
+ explicit FileRef(PP_Resource resource); |
// This constructor is used when we've gotten a PP_Resource as a return value |
// that has already been addref'ed for us. |
struct PassRef {}; |
- FileRef_Dev(PassRef, PP_Resource resource); |
+ FileRef(PassRef, PP_Resource resource); |
// Creates a FileRef pointing to a path in the given filesystem. |
- FileRef_Dev(const FileSystem_Dev& file_system, const char* path); |
+ FileRef(const FileSystem& file_system, const char* path); |
- FileRef_Dev(const FileRef_Dev& other); |
+ FileRef(const FileRef& other); |
// Returns the file system type. |
- PP_FileSystemType_Dev GetFileSystemType() const; |
+ PP_FileSystemType GetFileSystemType() const; |
// Returns the name of the file. |
Var GetName() const; |
@@ -46,7 +46,7 @@ |
// Returns the parent directory of this file. See PPB_FileRef::GetParent for |
// more details. |
- FileRef_Dev GetParent() const; |
+ FileRef GetParent() const; |
int32_t MakeDirectory(const CompletionCallback& cc); |
@@ -58,7 +58,7 @@ |
int32_t Delete(const CompletionCallback& cc); |
- int32_t Rename(const FileRef_Dev& new_file_ref, const CompletionCallback& cc); |
+ int32_t Rename(const FileRef& new_file_ref, const CompletionCallback& cc); |
}; |
} // namespace pp |