content/browser/speech/speech_recognition_manager_impl.cc - Issue 1892433002: Moving device description utils from AudioManager[Base] into AudioDeviceDescription; to be shared b…

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: content/browser/speech/speech_recognition_manager_impl.cc

Issue 1892433002: Moving device description utils from AudioManager[Base] into AudioDeviceDescription; to be shared b… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: another rebase Created 4 years, 8 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 | « content/browser/renderer_host/render_message_filter.cc ('k') | content/browser/speech/speech_recognizer_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/speech/speech_recognition_manager_impl.cc

diff --git a/content/browser/speech/speech_recognition_manager_impl.cc b/content/browser/speech/speech_recognition_manager_impl.cc

index 4dde801825fd163fc9ef01240ee4f6fcf6d2a2c7..7cc9137eaaef7df75cb78478ded42e85179c41f4 100644

--- a/content/browser/speech/speech_recognition_manager_impl.cc

+++ b/content/browser/speech/speech_recognition_manager_impl.cc

@@ -25,8 +25,8 @@

#include "content/public/browser/speech_recognition_session_context.h"

#include "content/public/common/speech_recognition_error.h"

#include "content/public/common/speech_recognition_result.h"

+#include "media/audio/audio_device_description.h"

#include "media/audio/audio_manager.h"

-#include "media/audio/audio_manager_base.h"

#if defined(OS_ANDROID)

#include "content/browser/speech/speech_recognizer_impl_android.h"

@@ -562,7 +562,7 @@ void SpeechRecognitionManagerImpl::SessionStart(const Session& session) {

// From the ask_user=false path, use the default device.

// TODO(xians): Abort the session after we do not need to support this path

// anymore.

- device_id = media::AudioManagerBase::kDefaultDeviceId;

+ device_id = media::AudioDeviceDescription::kDefaultDeviceId;

} else {

// From the ask_user=true path, use the selected device.

DCHECK_EQ(1u, devices.size());