summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-04 23:51:10 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-04 23:51:10 +0000
commit20566c9399509e51671f1781d38ba62c9a83454c (patch)
tree38354148edca34672c4c44584ab1e6c1ef610470
parentfbbed0aba0e92c7aa9545d1e8ed5a18f4b23c70e (diff)
downloadchromium_src-20566c9399509e51671f1781d38ba62c9a83454c.zip
chromium_src-20566c9399509e51671f1781d38ba62c9a83454c.tar.gz
chromium_src-20566c9399509e51671f1781d38ba62c9a83454c.tar.bz2
base: Remove unnecessary using declarations from values.h
BUG=None TEST=None R=evan@chromium.org Review URL: http://codereview.chromium.org/7572032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95538 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/values.cc4
-rw-r--r--base/values.h3
-rw-r--r--chrome/browser/extensions/external_pref_extension_loader.cc2
-rw-r--r--content/common/json_value_serializer.h6
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.