diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-23 20:00:20 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-23 20:00:20 +0000 |
| commit | 93d49d70b89b22ec46d0b00b7950297f64865d56 (patch) | |
| tree | 3243e0209c738df0c18c2ba615667f757fcaec94 /chrome/browser/extensions/extension_function.cc | |
| parent | a9f607e33a91604bc63bd8c846aefbda9bf0dfa9 (diff) | |
| download | chromium_src-93d49d70b89b22ec46d0b00b7950297f64865d56.zip chromium_src-93d49d70b89b22ec46d0b00b7950297f64865d56.tar.gz chromium_src-93d49d70b89b22ec46d0b00b7950297f64865d56.tar.bz2 | |
Move the json-related files into a separate json directory. This hopefully also
makes the naming of string_escape more clear (it's actually JSON-specific).
Move the files into the base namespace.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/316016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29934 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_function.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_function.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_function.cc b/chrome/browser/extensions/extension_function.cc index c15c18b..b8aaae1 100644 --- a/chrome/browser/extensions/extension_function.cc +++ b/chrome/browser/extensions/extension_function.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/extension_function.h" -#include "base/json_writer.h" +#include "base/json/json_writer.h" #include "base/logging.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" @@ -17,7 +17,7 @@ const std::string AsyncExtensionFunction::GetResult() { std::string json; // Some functions might not need to return any results. if (result_.get()) - JSONWriter::Write(result_.get(), false, &json); + base::JSONWriter::Write(result_.get(), false, &json); return json; } |