diff options
| -rw-r--r-- | base/values.cc | 4 | ||||
| -rw-r--r-- | base/values.h | 3 | ||||
| -rw-r--r-- | chrome/browser/extensions/external_pref_extension_loader.cc | 2 | ||||
| -rw-r--r-- | content/common/json_value_serializer.h | 6 |
4 files changed, 8 insertions, 7 deletions
diff --git a/base/values.cc b/base/values.cc index adfc9a8..126d7f3 100644 --- a/base/values.cc +++ b/base/values.cc @@ -59,6 +59,8 @@ Value* CopyWithoutEmptyChildren(Value* node) { } // namespace +namespace base { + ///////////////////// Value //////////////////// Value::~Value() { @@ -906,3 +908,5 @@ bool ListValue::Equals(const Value* other) const { ValueSerializer::~ValueSerializer() { } + +} // namespace base diff --git a/base/values.h b/base/values.h index 21ddfce..55e7be0 100644 --- a/base/values.h +++ b/base/values.h @@ -471,8 +471,5 @@ using base::FundamentalValue; using base::ListValue; using base::StringValue; using base::Value; -using base::ValueMap; -using base::ValueSerializer; -using base::ValueVector; #endif // BASE_VALUES_H_ diff --git a/chrome/browser/extensions/external_pref_extension_loader.cc b/chrome/browser/extensions/external_pref_extension_loader.cc index 37b7b8f..8d90ee7 100644 --- a/chrome/browser/extensions/external_pref_extension_loader.cc +++ b/chrome/browser/extensions/external_pref_extension_loader.cc @@ -15,7 +15,7 @@ namespace { // Caller takes ownership of the returned dictionary. DictionaryValue* ExtractPrefs(const FilePath& path, - ValueSerializer* serializer) { + base::ValueSerializer* serializer) { std::string error_msg; Value* extensions = serializer->Deserialize(NULL, &error_msg); if (!extensions) { diff --git a/content/common/json_value_serializer.h b/content/common/json_value_serializer.h index 8d2a8f5..afb18f8 100644 --- a/content/common/json_value_serializer.h +++ b/content/common/json_value_serializer.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// 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. @@ -12,7 +12,7 @@ #include "base/file_path.h" #include "base/values.h" -class JSONStringValueSerializer : public ValueSerializer { +class JSONStringValueSerializer : public base::ValueSerializer { public: // json_string is the string that will be source of the deserialization // or the destination of the serialization. The caller of the constructor @@ -66,7 +66,7 @@ class JSONStringValueSerializer : public ValueSerializer { DISALLOW_COPY_AND_ASSIGN(JSONStringValueSerializer); }; -class JSONFileValueSerializer : public ValueSerializer { +class JSONFileValueSerializer : public base::ValueSerializer { public: // json_file_patch is the path of a file that will be source of the // deserialization or the destination of the serialization. |