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/dom_ui | |
| 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/dom_ui')
| -rw-r--r-- | chrome/browser/dom_ui/dom_ui.cc | 9 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/new_tab_page_sync_handler.cc | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/chrome/browser/dom_ui/dom_ui.cc b/chrome/browser/dom_ui/dom_ui.cc index 7f38aef..34c5956 100644 --- a/chrome/browser/dom_ui/dom_ui.cc +++ b/chrome/browser/dom_ui/dom_ui.cc @@ -5,8 +5,7 @@ #include "chrome/browser/dom_ui/dom_ui.h" #include "app/l10n_util.h" -#include "base/json_reader.h" -#include "base/json_writer.h" +#include "base/json/json_writer.h" #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/values.h" @@ -56,7 +55,7 @@ void DOMUI::CallJavascriptFunction(const std::wstring& function_name) { void DOMUI::CallJavascriptFunction(const std::wstring& function_name, const Value& arg) { std::string json; - JSONWriter::Write(&arg, false, &json); + base::JSONWriter::Write(&arg, false, &json); std::wstring javascript = function_name + L"(" + UTF8ToWide(json) + L");"; ExecuteJavascript(javascript); @@ -66,9 +65,9 @@ void DOMUI::CallJavascriptFunction( const std::wstring& function_name, const Value& arg1, const Value& arg2) { std::string json; - JSONWriter::Write(&arg1, false, &json); + base::JSONWriter::Write(&arg1, false, &json); std::wstring javascript = function_name + L"(" + UTF8ToWide(json); - JSONWriter::Write(&arg2, false, &json); + base::JSONWriter::Write(&arg2, false, &json); javascript += L"," + UTF8ToWide(json) + L");"; ExecuteJavascript(javascript); diff --git a/chrome/browser/dom_ui/new_tab_page_sync_handler.cc b/chrome/browser/dom_ui/new_tab_page_sync_handler.cc index b4db8b3..ff63cf6 100644 --- a/chrome/browser/dom_ui/new_tab_page_sync_handler.cc +++ b/chrome/browser/dom_ui/new_tab_page_sync_handler.cc @@ -7,7 +7,6 @@ #include "chrome/browser/dom_ui/new_tab_page_sync_handler.h" #include "app/l10n_util.h" -#include "base/json_writer.h" #include "base/string_util.h" #include "base/values.h" #include "chrome/browser/net/chrome_url_request_context.h" |