base: Rename ValueType to something less redundant as _just_ Type.

So instead of:

base::Value::ValueType

We write a nice:

base::Value::Type

BUG=None
TEST=None

R=evan@chromium.org

Review URL: http://codereview.chromium.org/7634018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96614 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 7 insertions, 7 deletions

diff --git a/base/values.cc b/base/values.cc
index d56cbe5..b215812 100644
--- a/base/values.cc
+++ b/base/values.cc
@@ -145,7 +145,7 @@ bool Value::Equals(const Value* a, const Value* b) {
   return a->Equals(b);
 }
 
-Value::Value(ValueType type) : type_(type) {
+Value::Value(Type type) : type_(type) {
 }
 
 ///////////////////// FundamentalValue ////////////////////
diff --git a/base/values.h b/base/values.h
index e0dd954..3af36c0 100644
--- a/base/values.h
+++ b/base/values.h
@@ -54,7 +54,7 @@ typedef std::map<std::string, Value*> ValueMap;
 // the subclasses.
 class BASE_EXPORT Value {
  public:
-  enum ValueType {
+  enum Type {
     TYPE_NULL = 0,
     TYPE_BOOLEAN,
     TYPE_INTEGER,
@@ -79,13 +79,13 @@ class BASE_EXPORT 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 ValueType to determine whether you can cast from
+  // 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.
-  ValueType GetType() const { return type_; }
+  Type GetType() const { return type_; }
 
   // Returns true if the current object represents a given type.
-  bool IsType(ValueType type) const { return type == type_; }
+  bool IsType(Type type) const { return type == type_; }
 
   // These methods allow the convenient retrieval of settings.
   // If the current setting object can be converted into the given type,
@@ -116,12 +116,12 @@ class BASE_EXPORT Value {
  protected:
   // This isn't safe for end-users (they should use the Create*Value()
   // static methods above), but it's useful for subclasses.
-  explicit Value(ValueType type);
+  explicit Value(Type type);
 
  private:
   Value();
 
-  ValueType type_;
+  Type type_;
 
   DISALLOW_COPY_AND_ASSIGN(Value);
 };