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

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

Issue 17005006: 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
« no previous file with comments | « ppapi/cpp/extensions/dev/socket_dev.cc ('k') | ppapi/cpp/extensions/ext_output_traits.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/cpp/extensions/dict_field.h
diff --git a/ppapi/cpp/extensions/dict_field.h b/ppapi/cpp/extensions/dict_field.h
index 5a085c3af82914453dc4f9ed2dd8dd2089544da6..f332014e8978a3f089eefe03e96f1e8b0e406af1 100644
--- a/ppapi/cpp/extensions/dict_field.h
+++ b/ppapi/cpp/extensions/dict_field.h
@@ -8,11 +8,11 @@
#include <string>
#include "ppapi/c/pp_bool.h"
-#include "ppapi/cpp/dev/var_dictionary_dev.h"
#include "ppapi/cpp/extensions/from_var_converter.h"
#include "ppapi/cpp/extensions/optional.h"
#include "ppapi/cpp/extensions/to_var_converter.h"
#include "ppapi/cpp/var.h"
+#include "ppapi/cpp/var_dictionary.h"
namespace pp {
namespace ext {
@@ -33,15 +33,15 @@ class DictField {
const T& operator()() const { return value_; }
// Adds this field to the dictionary var.
- bool AddTo(VarDictionary_Dev* dict) const {
+ bool AddTo(VarDictionary* dict) const {
if (!dict)
return false;
internal::ToVarConverter<T> converter(value_);
- return PP_ToBool(dict->Set(Var(key_), converter.var()));
+ return dict->Set(Var(key_), converter.var());
}
- bool Populate(const VarDictionary_Dev& dict) {
+ bool Populate(const VarDictionary& dict) {
Var value_var = dict.Get(Var(key_));
if (value_var.is_undefined())
return false;
@@ -72,17 +72,17 @@ class OptionalDictField {
const Optional<T>& operator()() const { return value_; }
// Adds this field to the dictionary var, if |value| has been set.
- bool MayAddTo(VarDictionary_Dev* dict) const {
+ bool MayAddTo(VarDictionary* dict) const {
if (!dict)
return false;
if (!value_.IsSet())
return true;
internal::ToVarConverter<T> converter(*value_);
- return PP_ToBool(dict->Set(Var(key_), converter.var()));
+ return dict->Set(Var(key_), converter.var());
}
- bool Populate(const VarDictionary_Dev& dict) {
+ bool Populate(const VarDictionary& dict) {
Var value_var = dict.Get(Var(key_));
internal::FromVarConverter<Optional<T> > converter(value_var.pp_var());
value_.Swap(&converter.value());
« no previous file with comments | « ppapi/cpp/extensions/dev/socket_dev.cc ('k') | ppapi/cpp/extensions/ext_output_traits.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698