more changes

base/values.h

 // 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.
 
 // This file specifies a recursive data storage class called Value intended for
 // storing setting and other persistable data.  It includes the ability to
 // specify (recursive) lists and dictionaries, so it's fairly expressive.
 // However, the API is optimized for the common case, namely storing a
 // hierarchical tree of simple values.  Given a DictionaryValue root, you can
 // easily do things like:
@@ skipping 22 matching lines @@
 #include "base/string16.h"
 
 // This file declares "using base::Value", etc. at the bottom, so that
 // current code can use these classes without the base namespace. In
 // new code, please always use base::Value, etc. or add your own
 // "using" declaration.
 // http://crbug.com/88666
 namespace base {
 
 class BinaryValue;
+class BooleanValue;
 class DictionaryValue;
-class FundamentalValue;
 class ListValue;
 class StringValue;
 class Value;
 
 typedef std::vector<Value*> ValueVector;
 typedef std::map<std::string, Value*> ValueMap;
 
-// The Value class is the base class for Values. A Value can be instantiated
-// via the Create*Value() factory methods, or by directly creating instances of
-// the subclasses.
+// The Value class is the base class for Values.
 class BASE_EXPORT Value {
  public:
   enum Type {
     TYPE_NULL = 0,
     TYPE_BOOLEAN,
     TYPE_INTEGER,
     TYPE_DOUBLE,
     TYPE_STRING,
     TYPE_BINARY,
     TYPE_DICTIONARY,
     TYPE_LIST
   };
 
   virtual ~Value();
 
-  // Convenience methods for creating Value objects for various
-  // kinds of values without thinking about which class implements them.
-  // These can always be expected to return a valid Value*.
-  static Value* CreateNullValue();
-  static FundamentalValue* CreateBooleanValue(bool in_value);
-  static FundamentalValue* CreateIntegerValue(int in_value);
-  static FundamentalValue* CreateDoubleValue(double in_value);
-  static StringValue* CreateStringValue(const std::string& in_value);
-  static StringValue* CreateStringValue(const string16& in_value);
-
   // Returns the type of the value stored by the current Value object.
   // Each type will be implemented by only one subclass of Value, so it's
   // safe to use the Type to determine whether you can cast from
   // Value* to (Implementing Class)*.  Also, a Value object never changes
   // its type after construction.
   Type GetType() const { return type_; }
 
   // Returns true if the current object represents a given type.
   bool IsType(Type type) const { return type == type_; }
 
@@ skipping 13 matching lines @@
   // to the copy.  The caller gets ownership of the copy, of course.
   //
   // Subclasses return their own type directly in their overrides;
   // this works because C++ supports covariant return types.
   virtual Value* DeepCopy() const;
 
   // Compares if two Value objects have equal contents.
   virtual bool Equals(const Value* other) const;
 
   // Compares if two Value objects have equal contents. Can handle NULLs.
-  // NULLs are considered equal but different from Value::CreateNullValue().
+  // NULLs are considered equal but different from NullValue.
   static bool Equals(const Value* a, const Value* b);
 
  protected:
-  // This isn't safe for end-users (they should use the Create*Value()
-  // static methods above), but it's useful for subclasses.
+  // This isn't safe for end-users (they should use the *Value::New()),
+  // but it's useful for subclasses.
   explicit Value(Type type);
 
  private:
   Value();
 
   Type type_;
 
   DISALLOW_COPY_AND_ASSIGN(Value);
 };
 
-// FundamentalValue represents the simple fundamental types of values.
-class BASE_EXPORT FundamentalValue : public Value {
+BASE_EXPORT Value* NullValue();
+BASE_EXPORT BooleanValue* TrueValue();
+BASE_EXPORT BooleanValue* FalseValue();
+
+class BASE_EXPORT BooleanValue : public Value {
  public:
-  explicit FundamentalValue(bool in_value);
-  explicit FundamentalValue(int in_value);
-  explicit FundamentalValue(double in_value);
-  virtual ~FundamentalValue();
+  explicit BooleanValue(bool value);
+  virtual ~BooleanValue();
+
+  static BooleanValue* New(bool value);
 
   // Overridden from Value:
   virtual bool GetAsBoolean(bool* out_value) const OVERRIDE;
+  virtual BooleanValue* DeepCopy() const OVERRIDE;
+  virtual bool Equals(const Value* other) const OVERRIDE;
+
+ private:
+  bool value_;
+
+  DISALLOW_COPY_AND_ASSIGN(BooleanValue);
+};
+
+class BASE_EXPORT NumberValue : public Value {
+ public:
+  explicit NumberValue(int value);
+  explicit NumberValue(double value);
+  virtual ~NumberValue();
+
+  static NumberValue* New(int value);
+  static NumberValue* New(double value);
+
+  // Overridden from Value:
   virtual bool GetAsInteger(int* out_value) const OVERRIDE;
   virtual bool GetAsDouble(double* out_value) const OVERRIDE;
-  virtual FundamentalValue* DeepCopy() const OVERRIDE;
+  virtual NumberValue* DeepCopy() const OVERRIDE;
   virtual bool Equals(const Value* other) const OVERRIDE;
 
  private:
   union {
-    bool boolean_value_;
     int integer_value_;
     double double_value_;
   };
 
-  DISALLOW_COPY_AND_ASSIGN(FundamentalValue);
+  DISALLOW_COPY_AND_ASSIGN(NumberValue);
 };
 
 class BASE_EXPORT StringValue : public Value {
  public:
   // Initializes a StringValue with a UTF-8 narrow character string.
   explicit StringValue(const std::string& in_value);
 
   // Initializes a StringValue with a string16.
   explicit StringValue(const string16& in_value);
 
   virtual ~StringValue();
 
+  static StringValue* New(const std::string& value);
+  static StringValue* New(const string16& value);
+
   // Overridden from Value:
   virtual bool GetAsString(std::string* out_value) const OVERRIDE;
   virtual bool GetAsString(string16* out_value) const OVERRIDE;
   virtual StringValue* DeepCopy() const OVERRIDE;
   virtual bool Equals(const Value* other) const OVERRIDE;
 
  private:
   std::string value_;
 
   DISALLOW_COPY_AND_ASSIGN(StringValue);
@@ skipping 287 matching lines @@
 
 }  // namespace base
 
 // http://crbug.com/88666
 using base::DictionaryValue;
 using base::ListValue;
 using base::StringValue;
 using base::Value;
 
 #endif  // BASE_VALUES_H_