chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc - Issue 2664753002: Remove base::StringValue

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/extensions/api/sync_file_system/sync_file_system_api.cc

Issue 2664753002: Remove base::StringValue (Closed)

Patch Set: Rebase Created 3 years, 9 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/extensions/api/storage/settings_sync_unittest.cc ('k') | chrome/browser/extensions/api/system_private/system_private_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc

diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc

index a7fdbf9e5600a134ad29fcdb6fbda6fe3b9c37dc..a8f2760508d0b4ac2b2ea786b34ca61f658d62cc 100644

--- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc

+++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc

@@ -371,8 +371,8 @@ SyncFileSystemSetConflictResolutionPolicyFunction::Run() {

ExtensionFunction::ResponseAction

SyncFileSystemGetConflictResolutionPolicyFunction::Run() {

- return RespondNow(OneArgument(

- base::MakeUnique<base::StringValue>(api::sync_file_system::ToString(

+ return RespondNow(

+ OneArgument(base::MakeUnique<base::Value>(api::sync_file_system::ToString(

api::sync_file_system::CONFLICT_RESOLUTION_POLICY_LAST_WRITE_WIN))));

}