chrome/common/web_resource/web_resource_unpacker.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/common/web_resource/web_resource_unpacker.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

Index: chrome/common/web_resource/web_resource_unpacker.cc

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

--- chrome/common/web_resource/web_resource_unpacker.cc (revision 29830)

+++ chrome/common/web_resource/web_resource_unpacker.cc (working copy)

@@ -4,7 +4,7 @@

#include "chrome/common/web_resource/web_resource_unpacker.h"

-#include "base/json_reader.h"

+#include "base/json/json_reader.h"

#include "base/values.h"

const char* WebResourceUnpacker::kInvalidDataTypeError =

@@ -19,7 +19,7 @@

bool WebResourceUnpacker::Run() {

scoped_ptr<Value> value;

if (!resource_data_.empty()) {

- value.reset(JSONReader::Read(resource_data_, false));

+ value.reset(base::JSONReader::Read(resource_data_, false));

if (!value.get()) {

// Page information not properly read, or corrupted.

error_message_ = kInvalidDataTypeError;

« no previous file with comments | « chrome/common/sandbox_mac.mm ('k') | chrome/renderer/dom_ui_bindings.cc » ('j') | no next file with comments »