diff options
| author | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 19:15:03 +0000 |
|---|---|---|
| committer | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 19:15:03 +0000 |
| commit | f3a1c64a4d81c412273ed567536f23c2c14813a2 (patch) | |
| tree | f0ced21805b18546e879413e4f808dd4f683c534 /base/json | |
| parent | 2338319a9acbaecba44243740b3f01b5c408a78a (diff) | |
| download | chromium_src-f3a1c64a4d81c412273ed567536f23c2c14813a2.zip chromium_src-f3a1c64a4d81c412273ed567536f23c2c14813a2.tar.gz chromium_src-f3a1c64a4d81c412273ed567536f23c2c14813a2.tar.bz2 | |
Move base/values.h into the base namespace. This includes a cros DEPS roll
with a minor change to that code since libcros also uses base/values.h.
BUG=88666
TEST=none
Review URL: http://codereview.chromium.org/7259019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/json')
| -rw-r--r-- | base/json/json_reader.h | 4 | ||||
| -rw-r--r-- | base/json/json_writer.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/base/json/json_reader.h b/base/json/json_reader.h index 4f83492..46e450c 100644 --- a/base/json/json_reader.h +++ b/base/json/json_reader.h @@ -43,10 +43,10 @@ #define FRIEND_TEST(test_case_name, test_name)\ friend class test_case_name##_##test_name##_Test -class Value; - namespace base { +class Value; + class BASE_API JSONReader { public: // A struct to hold a JS token. diff --git a/base/json/json_writer.h b/base/json/json_writer.h index c019e87..36331bb 100644 --- a/base/json/json_writer.h +++ b/base/json/json_writer.h @@ -11,10 +11,10 @@ #include "base/base_api.h" #include "base/basictypes.h" -class Value; - namespace base { +class Value; + class BASE_API JSONWriter { public: // Given a root node, generates a JSON string and puts it into |json|. |