chrome/browser/copresence/chrome_whispernet_client.cc - Issue 820673004: json_schema_compiler: Use std::vector<char> for binary values.

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/copresence/chrome_whispernet_client.cc

Issue 820673004: json_schema_compiler: Use std::vector<char> for binary values. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@simplify_json_schema

Patch Set: Fix merge error. Created 5 years, 11 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/chromeos/file_system_provider/operations/write_file_unittest.cc ('k') | chrome/browser/extensions/api/braille_display_private/braille_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/copresence/chrome_whispernet_client.cc

diff --git a/chrome/browser/copresence/chrome_whispernet_client.cc b/chrome/browser/copresence/chrome_whispernet_client.cc

index 997cf28283c122997a58f56f0c4d0d31743e7b83..07483716aad815f4bf9dc074c11c16c8daefbd29 100644

--- a/chrome/browser/copresence/chrome_whispernet_client.cc

+++ b/chrome/browser/copresence/chrome_whispernet_client.cc

@@ -114,7 +114,7 @@ void ChromeWhispernetClient::DecodeSamples(copresence::AudioType type,

DCHECK(extensions::EventRouter::Get(browser_context_));

extensions::api::copresence_private::DecodeSamplesParameters params;

- params.samples = samples;

+ params.samples.assign(samples.begin(), samples.end());

params.decode_audible =

type == copresence::AUDIBLE || type == copresence::BOTH;

params.decode_inaudible =

@@ -191,7 +191,7 @@ void ChromeWhispernetClient::AudioConfiguration(

// nacl wrapper.

const size_t params_size = sizeof(params);

audio_params.param_data.resize(params_size);

- memcpy(string_as_array(&audio_params.param_data), &params, params_size);

+ memcpy(vector_as_array(&audio_params.param_data), &params, params_size);

scoped_ptr<extensions::Event> event(new extensions::Event(

extensions::api::copresence_private::OnConfigAudio::kEventName,