Index: base/values.h |
diff --git a/base/values.h b/base/values.h |
index 4b7999c7122a91ca4f318586b8b04f2f3a31521c..16a574f1b93aa2f110471727c2eada7aa9dbb9b0 100644 |
--- a/base/values.h |
+++ b/base/values.h |
@@ -37,7 +37,6 @@ namespace base { |
class BinaryValue; |
class DictionaryValue; |
-class FundamentalValue; |
class ListValue; |
class StringValue; |
class Value; |
@@ -62,6 +61,9 @@ class BASE_EXPORT Value { |
}; |
Value(); // A null value. |
+ Value(bool in_bool); |
+ Value(int in_int); |
+ Value(double in_double); |
virtual ~Value(); |
@@ -134,11 +136,6 @@ class BASE_EXPORT Value { |
Value(const Value& that); |
Value& operator=(const Value& that); |
- // TODO(brettw) move to public when FundamentalValue is gone. |
- Value(bool in_bool); |
- Value(int in_int); |
- Value(double in_double); |
- |
private: |
Type type_; |
@@ -149,16 +146,6 @@ class BASE_EXPORT Value { |
}; |
}; |
-// FundamentalValue represents the simple fundamental types of values. |
-// TODO(brettw) remove when callers are updated to use raw Value. |
-class BASE_EXPORT FundamentalValue : public Value { |
- public: |
- explicit FundamentalValue(bool in_value); |
- explicit FundamentalValue(int in_value); |
- explicit FundamentalValue(double in_value); |
- ~FundamentalValue() override; |
-}; |
- |
class BASE_EXPORT StringValue : public Value { |
public: |
// Initializes a StringValue with a UTF-8 narrow character string. |
@@ -554,11 +541,6 @@ class BASE_EXPORT ValueDeserializer { |
BASE_EXPORT std::ostream& operator<<(std::ostream& out, const Value& value); |
BASE_EXPORT inline std::ostream& operator<<(std::ostream& out, |
- const FundamentalValue& value) { |
- return out << static_cast<const Value&>(value); |
-} |
- |
-BASE_EXPORT inline std::ostream& operator<<(std::ostream& out, |
const StringValue& value) { |
return out << static_cast<const Value&>(value); |
} |