diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/content/public/browser/speech_recognition_session_context.h | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/content/public/browser/speech_recognition_session_context.h')
| -rw-r--r-- | chromium/content/public/browser/speech_recognition_session_context.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/chromium/content/public/browser/speech_recognition_session_context.h b/chromium/content/public/browser/speech_recognition_session_context.h index 143773c778c..5606b78f352 100644 --- a/chromium/content/public/browser/speech_recognition_session_context.h +++ b/chromium/content/public/browser/speech_recognition_session_context.h @@ -26,9 +26,24 @@ struct CONTENT_EXPORT SpeechRecognitionSessionContext { int render_process_id; int render_view_id; + // Browser plugin guest's render view id, if this context represents a speech - // recognition request from an embedder on behalf of the guest. + // recognition request from an embedder on behalf of the guest. This is used + // for input tag where speech bubble is to be shown. + // + // TODO(lazyboy): Right now showing bubble from guest does not work, we fall + // back to embedder instead, fix this and use + // embedder_render_process_id/embedder_render_view_id similar to Web Speech + // API below. int guest_render_view_id; + + // The pair (|embedder_render_process_id|, |embedder_render_view_id|) + // represents a Browser plugin guest's embedder. This is filled in if the + // session is from a guest Web Speech API. We use these to check if the + // embedder (app) is permitted to use audio. + int embedder_render_process_id; + int embedder_render_view_id; + int request_id; // Determines whether recognition was requested by a page element (in which |