chrome/browser/automation/automation_provider.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/automation/automation_provider.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/automation/automation_extension_function.cc ('k') | chrome/browser/automation/extension_port_container.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/automation/automation_provider.cc

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

--- chrome/browser/automation/automation_provider.cc (revision 29830)

+++ chrome/browser/automation/automation_provider.cc (working copy)

@@ -9,7 +9,7 @@

#include "app/l10n_util.h"

#include "app/message_box_flags.h"

#include "base/file_version_info.h"

-#include "base/json_reader.h"

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

#include "base/keyboard_codes.h"

#include "base/message_loop.h"

#include "base/path_service.h"

@@ -1654,7 +1654,7 @@

// The message is a JSON-encoded array with two elements, both strings. The

// first is the name of the event to dispatch. The second is a JSON-encoding

// of the arguments specific to that event.

- scoped_ptr<Value> message_value(JSONReader::Read(message, false));

+ scoped_ptr<Value> message_value(base::JSONReader::Read(message, false));

if (!message_value.get() || !message_value->IsType(Value::TYPE_LIST)) {

LOG(WARNING) << "Invalid browser event specified through automation";

return false;