diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-16 04:12:26 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-16 04:12:26 +0000 |
commit | 04af979a6940c84bc315b3bf6c946824f0262614 (patch) | |
tree | 57f674d57a0094dbed84b7e10928f439e6f1c6e2 /base/json | |
parent | 25992218bf83508ab41da4246e9c634df2a07c36 (diff) | |
download | chromium_src-04af979a6940c84bc315b3bf6c946824f0262614.zip chromium_src-04af979a6940c84bc315b3bf6c946824f0262614.tar.gz chromium_src-04af979a6940c84bc315b3bf6c946824f0262614.tar.bz2 |
Make base compile with no "using base::FilePath".
For base .cc files not using the base namespace, I added a using since theses
files should be moved to the base namespace, and then explicit qualification
will no longer be necessary.
Original review URL: https://codereview.chromium.org/12226121
(reland of r182040).
Review URL: https://codereview.chromium.org/12278014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182916 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/json')
-rw-r--r-- | base/json/json_file_value_serializer.cc | 2 | ||||
-rw-r--r-- | base/json/json_file_value_serializer.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/base/json/json_file_value_serializer.cc b/base/json/json_file_value_serializer.cc index 2fac451..5ee974b 100644 --- a/base/json/json_file_value_serializer.cc +++ b/base/json/json_file_value_serializer.cc @@ -8,6 +8,8 @@ #include "base/json/json_string_value_serializer.h" #include "base/logging.h" +using base::FilePath; + const char* JSONFileValueSerializer::kAccessDenied = "Access denied."; const char* JSONFileValueSerializer::kCannotReadFile = "Can't read file."; const char* JSONFileValueSerializer::kFileLocked = "File locked."; diff --git a/base/json/json_file_value_serializer.h b/base/json/json_file_value_serializer.h index 633db5d..3869e5e 100644 --- a/base/json/json_file_value_serializer.h +++ b/base/json/json_file_value_serializer.h @@ -18,7 +18,7 @@ class BASE_EXPORT JSONFileValueSerializer : public base::ValueSerializer { // deserialization or the destination of the serialization. // When deserializing, the file should exist, but when serializing, the // serializer will attempt to create the file at the specified location. - explicit JSONFileValueSerializer(const FilePath& json_file_path) + explicit JSONFileValueSerializer(const base::FilePath& json_file_path) : json_file_path_(json_file_path), allow_trailing_comma_(false) {} @@ -74,7 +74,7 @@ class BASE_EXPORT JSONFileValueSerializer : public base::ValueSerializer { private: bool SerializeInternal(const Value& root, bool omit_binary_values); - FilePath json_file_path_; + base::FilePath json_file_path_; bool allow_trailing_comma_; // A wrapper for file_util::ReadFileToString which returns a non-zero |