| Index: ppapi/cpp/directory_reader.h
|
| diff --git a/ppapi/cpp/dev/directory_reader_dev.h b/ppapi/cpp/directory_reader.h
|
| similarity index 63%
|
| rename from ppapi/cpp/dev/directory_reader_dev.h
|
| rename to ppapi/cpp/directory_reader.h
|
| index cd2ce781372be011dd523e1e2973de8fc1b8f3e1..8d718fe14dd0df60a5702e00e2a0e025336c6e63 100644
|
| --- a/ppapi/cpp/dev/directory_reader_dev.h
|
| +++ b/ppapi/cpp/directory_reader.h
|
| @@ -2,30 +2,38 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef PPAPI_CPP_DEV_DIRECTORY_READER_DEV_H_
|
| -#define PPAPI_CPP_DEV_DIRECTORY_READER_DEV_H_
|
| +#ifndef PPAPI_CPP_DIRECTORY_READER_H_
|
| +#define PPAPI_CPP_DIRECTORY_READER_H_
|
|
|
| #include <vector>
|
|
|
| -#include "ppapi/c/dev/ppb_directory_reader_dev.h"
|
| +#include "ppapi/c/ppb_directory_reader.h"
|
| #include "ppapi/cpp/resource.h"
|
|
|
| +/// @file
|
| +/// This file defines the API used to read entries in a directory.
|
| +
|
| namespace pp {
|
|
|
| -class DirectoryEntry_Dev;
|
| +class DirectoryEntry;
|
| class FileRef;
|
| template<typename T> class CompletionCallbackWithOutput;
|
|
|
| -class DirectoryReader_Dev : public Resource {
|
| +/// The <code>DirectoryReader</code> class provides a function to read entries
|
| +/// in a directory.
|
| +class DirectoryReader : public Resource {
|
| public:
|
| - /// A constructor that creates a DirectoryReader resource for the given
|
| - /// directory.
|
| + /// A constructor that creates a <code>DirectoryReader</code> resource for the
|
| + /// given directory.
|
| ///
|
| /// @param[in] directory_ref A <code>PP_Resource</code> corresponding to the
|
| /// directory reference to be read.
|
| - explicit DirectoryReader_Dev(const FileRef& directory_ref);
|
| + explicit DirectoryReader(const FileRef& directory_ref);
|
|
|
| - DirectoryReader_Dev(const DirectoryReader_Dev& other);
|
| + /// A copy constructor for <code>DirectoryEntry</code>.
|
| + ///
|
| + /// @return other A pointer to a <code>DirectoryReader</code>.
|
| + DirectoryReader(const DirectoryReader& other);
|
|
|
| /// ReadEntries() Reads all entries in the directory.
|
| ///
|
| @@ -39,7 +47,7 @@ class DirectoryReader_Dev : public Resource {
|
| ///
|
| /// @code
|
| /// void OnReadEntries(int32_t result,
|
| - /// const std::vector<DirectoryEntry_Dev>& entries) {
|
| + /// const std::vector<DirectoryEntry>& entries) {
|
| /// if (result == PP_OK)
|
| /// // use entries...
|
| /// }
|
| @@ -47,7 +55,7 @@ class DirectoryReader_Dev : public Resource {
|
| ///
|
| /// @return An int32_t containing an error code from <code>pp_errors.h</code>.
|
| int32_t ReadEntries(
|
| - const CompletionCallbackWithOutput< std::vector<DirectoryEntry_Dev> >&
|
| + const CompletionCallbackWithOutput< std::vector<DirectoryEntry> >&
|
| callback);
|
| };
|
|
|
|
|