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

Unified Diff: chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h

Issue 880393002: Fix webrtcAudioPrivate API to handle requests from <webview>s. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update test 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 | « no previous file | chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h
diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h
index efc2d98e07a74cd3dbb00552885eed23259a19d7..7eb492f352bd7fd7703686d0d8efce51195ff5f2 100644
--- a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h
+++ b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h
@@ -9,7 +9,7 @@
#include "base/system_monitor/system_monitor.h"
#include "chrome/browser/extensions/chrome_extension_function.h"
#include "chrome/common/extensions/api/webrtc_audio_private.h"
-#include "content/public/browser/render_view_host.h"
+#include "content/public/browser/render_process_host.h"
#include "extensions/browser/browser_context_keyed_api_factory.h"
#include "media/audio/audio_device_name.h"
#include "url/gurl.h"
@@ -68,11 +68,11 @@ class WebrtcAudioPrivateFunction : public ChromeAsyncExtensionFunction {
// entire function should fail.
//
// Call from any thread. Callback will occur on originating thread.
- bool GetControllerList(int tab_id);
+ bool GetControllerList(const api::webrtc_audio_private::RequestInfo& request);
// Must override this if you call GetControllerList.
virtual void OnControllerList(
- const content::RenderViewHost::AudioOutputControllerList& list);
+ const content::RenderProcessHost::AudioOutputControllerList& list);
// Calculates a single HMAC. Call from any thread. Calls back via
// OnHMACCalculated on UI thread.
@@ -134,7 +134,7 @@ class WebrtcAudioPrivateGetActiveSinkFunction
bool RunAsync() override;
void OnControllerList(
- const content::RenderViewHost::AudioOutputControllerList& controllers)
+ const content::RenderProcessHost::AudioOutputControllerList& controllers)
override;
void OnHMACCalculated(const std::string& hmac) override;
};
@@ -153,18 +153,18 @@ class WebrtcAudioPrivateSetActiveSinkFunction
bool RunAsync() override;
void OnControllerList(
- const content::RenderViewHost::AudioOutputControllerList& controllers)
+ const content::RenderProcessHost::AudioOutputControllerList& controllers)
override;
void OnOutputDeviceNames(
scoped_ptr<media::AudioDeviceNames> device_names) override;
void SwitchDone();
void DoneOnUIThread();
- int tab_id_;
+ api::webrtc_audio_private::RequestInfo request_info_;
std::string sink_id_;
// Filled in by OnControllerList.
- content::RenderViewHost::AudioOutputControllerList controllers_;
+ content::RenderProcessHost::AudioOutputControllerList controllers_;
// Number of sink IDs we are still waiting for. Can become greater
// than 0 in OnControllerList, decreases on every OnSinkId call.
« no previous file with comments | « no previous file | chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698