| Index: ppapi/cpp/directory_reader.cc
|
| diff --git a/ppapi/cpp/dev/directory_reader_dev.cc b/ppapi/cpp/directory_reader.cc
|
| similarity index 51%
|
| rename from ppapi/cpp/dev/directory_reader_dev.cc
|
| rename to ppapi/cpp/directory_reader.cc
|
| index aebdca5e5231e660d7da8315a10495633c43c5de..c67eef9e9dc7fb9669c64d9a4235ebfe2da3c6f1 100644
|
| --- a/ppapi/cpp/dev/directory_reader_dev.cc
|
| +++ b/ppapi/cpp/directory_reader.cc
|
| @@ -2,11 +2,11 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ppapi/cpp/dev/directory_reader_dev.h"
|
| +#include "ppapi/cpp/directory_reader.h"
|
|
|
| #include "ppapi/c/pp_errors.h"
|
| #include "ppapi/cpp/completion_callback.h"
|
| -#include "ppapi/cpp/dev/directory_entry_dev.h"
|
| +#include "ppapi/cpp/directory_entry.h"
|
| #include "ppapi/cpp/file_ref.h"
|
| #include "ppapi/cpp/module.h"
|
| #include "ppapi/cpp/module_impl.h"
|
| @@ -15,29 +15,29 @@ namespace pp {
|
|
|
| namespace {
|
|
|
| -template <> const char* interface_name<PPB_DirectoryReader_Dev_0_6>() {
|
| - return PPB_DIRECTORYREADER_DEV_INTERFACE_0_6;
|
| +template <> const char* interface_name<PPB_DirectoryReader_1_0>() {
|
| + return PPB_DIRECTORYREADER_INTERFACE_1_0;
|
| }
|
|
|
| } // namespace
|
|
|
| -DirectoryReader_Dev::DirectoryReader_Dev(const FileRef& directory_ref) {
|
| - if (!has_interface<PPB_DirectoryReader_Dev_0_6>())
|
| +DirectoryReader::DirectoryReader(const FileRef& directory_ref) {
|
| + if (!has_interface<PPB_DirectoryReader_1_0>())
|
| return;
|
| - PassRefFromConstructor(get_interface<PPB_DirectoryReader_Dev_0_6>()->Create(
|
| + PassRefFromConstructor(get_interface<PPB_DirectoryReader_1_0>()->Create(
|
| directory_ref.pp_resource()));
|
| }
|
|
|
| -DirectoryReader_Dev::DirectoryReader_Dev(const DirectoryReader_Dev& other)
|
| +DirectoryReader::DirectoryReader(const DirectoryReader& other)
|
| : Resource(other) {
|
| }
|
|
|
| -int32_t DirectoryReader_Dev::ReadEntries(
|
| - const CompletionCallbackWithOutput< std::vector<DirectoryEntry_Dev> >&
|
| +int32_t DirectoryReader::ReadEntries(
|
| + const CompletionCallbackWithOutput< std::vector<DirectoryEntry> >&
|
| callback) {
|
| - if (!has_interface<PPB_DirectoryReader_Dev_0_6>())
|
| + if (!has_interface<PPB_DirectoryReader_1_0>())
|
| return callback.MayForce(PP_ERROR_NOINTERFACE);
|
| - return get_interface<PPB_DirectoryReader_Dev_0_6>()->ReadEntries(
|
| + return get_interface<PPB_DirectoryReader_1_0>()->ReadEntries(
|
| pp_resource(), callback.output(), callback.pp_completion_callback());
|
| }
|
|
|
|
|