chrome/browser/dom_ui/dom_ui.cc - Issue 316016: Move the json-related files into a separate json directory. This hopefully al...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/dom_ui/dom_ui.cc

Issue 316016: Move the json-related files into a separate json directory. This hopefully al... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 11 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/debugger/extension_ports_remote_service.cc ('k') | chrome/browser/dom_ui/new_tab_page_sync_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/dom_ui/dom_ui.cc

===================================================================

--- chrome/browser/dom_ui/dom_ui.cc (revision 29830)

+++ chrome/browser/dom_ui/dom_ui.cc (working copy)

@@ -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,

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 @@

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);

« no previous file with comments | « chrome/browser/debugger/extension_ports_remote_service.cc ('k') | chrome/browser/dom_ui/new_tab_page_sync_handler.cc » ('j') | no next file with comments »