This patch does:

# use MakeMediaRequest to query the permission for the devices.
# Notify the UI on device opened and closed.

BUG=146498,132965
TEST=run chrome with --enable-scripted-speech, go to http://www.corp.google.com/~hwennborg/speechreco.html, test the behavior manually.

Review URL: https://chromiumcodereview.appspot.com/11415097

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169068 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 5 deletions

diff --git a/content/browser/speech/speech_recognition_manager_impl.h b/content/browser/speech/speech_recognition_manager_impl.h
index 5024be3..732426c 100644
--- a/content/browser/speech/speech_recognition_manager_impl.h
+++ b/content/browser/speech/speech_recognition_manager_impl.h
@@ -130,6 +130,12 @@ class CONTENT_EXPORT SpeechRecognitionManagerImpl :
                                   bool ask_user,
                                   bool is_allowed);
 
+  // Callback to get back the result of a media request. |label| is the string
+  // to identify the request; |devices| is an array of devices approved to be
+  // used for the request, |devices| is empty if the users deny the request.
+  void MediaRequestPermissionCallback(const std::string& label,
+                                      const MediaStreamDevices& devices);
+
   // Entry point for pushing any external event into the session handling FSM.
   void DispatchEvent(int session_id, FSMEvent event);
 
@@ -166,11 +172,6 @@ class CONTENT_EXPORT SpeechRecognitionManagerImpl :
   // about this class being destroyed in the meanwhile (due to browser shutdown)
   // since tasks pending on a destroyed WeakPtr are automatically discarded.
   base::WeakPtrFactory<SpeechRecognitionManagerImpl> weak_factory_;
-
-#if !defined(OS_IOS)
-  class PermissionRequest;
-  scoped_ptr<PermissionRequest> permission_request_;
-#endif  // !defined(OS_IOS)
 };
 
 }  // namespace content