Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(107)

Side by Side Diff: content/public/browser/speech_recognition_session_context.h

Issue 636863003: Make SpeechRecognition per RenderFrame instead of per RenderView. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes threading issues Created 6 years 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_PUBLIC_BROWSER_SPEECH_RECOGNITION_SESSION_CONTEXT_H_ 5 #ifndef CONTENT_PUBLIC_BROWSER_SPEECH_RECOGNITION_SESSION_CONTEXT_H_
6 #define CONTENT_PUBLIC_BROWSER_SPEECH_RECOGNITION_SESSION_CONTEXT_H_ 6 #define CONTENT_PUBLIC_BROWSER_SPEECH_RECOGNITION_SESSION_CONTEXT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "content/common/content_export.h" 10 #include "content/common/content_export.h"
11 #include "content/public/common/media_stream_request.h" 11 #include "content/public/common/media_stream_request.h"
12 #include "ui/gfx/rect.h" 12 #include "ui/gfx/rect.h"
13 13
14 namespace content { 14 namespace content {
15 15
16 // The context information required by clients of the SpeechRecognitionManager 16 // The context information required by clients of the SpeechRecognitionManager
17 // and its delegates for mapping the recognition session to other browser 17 // and its delegates for mapping the recognition session to other browser
18 // elements involved with it (e.g., the page element that requested the 18 // elements involved with it (e.g., the page element that requested the
19 // recognition). The manager keeps this struct attached to the recognition 19 // recognition). The manager keeps this struct attached to the recognition
20 // session during all the session lifetime, making its contents available to 20 // session during all the session lifetime, making its contents available to
21 // clients (In this regard, see SpeechRecognitionManager::GetSessionContext and 21 // clients (In this regard, see SpeechRecognitionManager::GetSessionContext and
22 // SpeechRecognitionManager::LookupSessionByContext methods). 22 // SpeechRecognitionManager::LookupSessionByContext methods).
23 struct CONTENT_EXPORT SpeechRecognitionSessionContext { 23 struct CONTENT_EXPORT SpeechRecognitionSessionContext {
24 SpeechRecognitionSessionContext(); 24 SpeechRecognitionSessionContext();
25 ~SpeechRecognitionSessionContext(); 25 ~SpeechRecognitionSessionContext();
26 26
27 int render_process_id; 27 int render_process_id;
28 int render_view_id;
29 int render_frame_id; 28 int render_frame_id;
30 29
31 // Browser plugin guest's render view id, if this context represents a speech 30 // Browser plugin guest's render frame id, if this context represents a speech
32 // recognition request from an embedder on behalf of the guest. This is used 31 // recognition request from an embedder on behalf of the guest. This is used
33 // for input tag where speech bubble is to be shown. 32 // for input tag where speech bubble is to be shown.
34 // 33 //
35 // TODO(lazyboy): Right now showing bubble from guest does not work, we fall 34 // TODO(lazyboy): Right now showing bubble from guest does not work, we fall
36 // back to embedder instead, fix this and use 35 // back to embedder instead, fix this and use
37 // embedder_render_process_id/embedder_render_view_id similar to Web Speech 36 // embedder_render_process_id/embedder_render_frame_id similar to Web Speech
38 // API below. 37 // API below.
39 int guest_render_view_id; 38 int guest_render_frame_id;
40 39
41 // The pair (|embedder_render_process_id|, |embedder_render_view_id|) 40 // The pair (|embedder_render_process_id|, |embedder_render_frame_id|)
42 // represents a Browser plugin guest's embedder. This is filled in if the 41 // represents a Browser plugin guest's embedder. This is filled in if the
43 // session is from a guest Web Speech API. We use these to check if the 42 // session is from a guest Web Speech API. We use these to check if the
44 // embedder (app) is permitted to use audio. 43 // embedder (app) is permitted to use audio.
45 int embedder_render_process_id; 44 int embedder_render_process_id;
46 int embedder_render_view_id; 45 int embedder_render_frame_id;
47 46
48 int request_id; 47 int request_id;
49 48
50 // A texual description of the context (website, extension name) that is 49 // A texual description of the context (website, extension name) that is
51 // requesting recognition, for prompting security notifications to the user. 50 // requesting recognition, for prompting security notifications to the user.
52 std::string context_name; 51 std::string context_name;
53 52
54 // The label for the permission request, it is used for request abortion. 53 // The label for the permission request, it is used for request abortion.
55 std::string label; 54 std::string label;
56 55
57 // A list of devices being used by the recognition session. 56 // A list of devices being used by the recognition session.
58 MediaStreamDevices devices; 57 MediaStreamDevices devices;
59 }; 58 };
60 59
61 } // namespace content 60 } // namespace content
62 61
63 #endif // CONTENT_PUBLIC_BROWSER_SPEECH_RECOGNITION_SESSION_CONTEXT_H_ 62 #endif // CONTENT_PUBLIC_BROWSER_SPEECH_RECOGNITION_SESSION_CONTEXT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698