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

Unified Diff: ppapi/cpp/extensions/from_var_converter.h

Issue 16136009: Move PPB_VarArray and PPB_VarDictionary out of dev. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months 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
Index: ppapi/cpp/extensions/from_var_converter.h
diff --git a/ppapi/cpp/extensions/from_var_converter.h b/ppapi/cpp/extensions/from_var_converter.h
index 094f0c483fc736848cd07443ebe73e02829e6159..06ae0df2501ff968196dd652db11e92a1ae6bc6b 100644
--- a/ppapi/cpp/extensions/from_var_converter.h
+++ b/ppapi/cpp/extensions/from_var_converter.h
@@ -8,12 +8,12 @@
#include <string>
#include "ppapi/c/pp_var.h"
-#include "ppapi/cpp/dev/var_array_dev.h"
-#include "ppapi/cpp/dev/var_dictionary_dev.h"
#include "ppapi/cpp/extensions/optional.h"
#include "ppapi/cpp/logging.h"
#include "ppapi/cpp/var.h"
+#include "ppapi/cpp/var_array.h"
#include "ppapi/cpp/var_array_buffer.h"
+#include "ppapi/cpp/var_dictionary.h"
namespace pp {
namespace ext {
@@ -173,8 +173,8 @@ class FromVarConverter<Var> : public FromVarConverterBase<Var> {
};
template <>
-class FromVarConverter<VarArray_Dev>
- : public FromVarConverterBase<VarArray_Dev> {
+class FromVarConverter<VarArray>
+ : public FromVarConverterBase<VarArray> {
public:
FromVarConverter() {
}
@@ -187,13 +187,13 @@ class FromVarConverter<VarArray_Dev>
}
void Set(const PP_Var& var) {
- FromVarConverterBase<VarArray_Dev>::value_ = Var(var);
+ FromVarConverterBase<VarArray>::value_ = Var(var);
}
};
template <>
-class FromVarConverter<VarDictionary_Dev>
- : public FromVarConverterBase<VarDictionary_Dev> {
+class FromVarConverter<VarDictionary>
+ : public FromVarConverterBase<VarDictionary> {
public:
FromVarConverter() {
}
@@ -206,7 +206,7 @@ class FromVarConverter<VarDictionary_Dev>
}
void Set(const PP_Var& var) {
- FromVarConverterBase<VarDictionary_Dev>::value_ = Var(var);
+ FromVarConverterBase<VarDictionary>::value_ = Var(var);
}
};

Powered by Google App Engine
This is Rietveld 408576698