chrome/common/sandbox_mac.mm - 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/sandbox_mac.mm

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/sandbox_mac.mm

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

--- chrome/common/sandbox_mac.mm (revision 29830)

+++ chrome/common/sandbox_mac.mm (working copy)

@@ -13,11 +13,11 @@

#include "base/basictypes.h"

#include "base/command_line.h"

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

#include "base/mac_util.h"

#include "base/scoped_cftyperef.h"

#include "base/scoped_nsautorelease_pool.h"

#include "base/string16.h"

-#include "base/string_escape.h"

#include "base/sys_info.h"

#include "base/sys_string_conversions.h"

#include "chrome/common/chrome_switches.h"

@@ -125,7 +125,7 @@

// surrounding sandbox syntax.

string16 home_dir = base::SysNSStringToUTF16(NSHomeDirectory());

std::string home_dir_escaped;

- string_escape::JsonDoubleQuote(home_dir, false, &home_dir_escaped);

+ base::JsonDoubleQuote(home_dir, false, &home_dir_escaped);

NSString* home_dir_escaped_ns = base::SysUTF8ToNSString(home_dir_escaped);

sandbox_data = [sandbox_data

stringByReplacingOccurrencesOfString:@"USER_HOMEDIR"

« no previous file with comments | « chrome/common/json_value_serializer_unittest.cc ('k') | chrome/common/web_resource/web_resource_unpacker.cc » ('j') | no next file with comments »