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

Unified Diff: extensions/shell/browser/shell_app_window.cc

Issue 493453004: app_shell: Add audio and video capture support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: (video-capture) rebase Created 6 years, 4 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 | « extensions/shell/browser/shell_app_window.h ('k') | extensions/shell/browser/shell_app_window_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/shell/browser/shell_app_window.cc
diff --git a/extensions/shell/browser/shell_app_window.cc b/extensions/shell/browser/shell_app_window.cc
index a66554ea1ca03f7e7b7292684f9fc5984e334fdb..238f058b56e1a5be3bc8e70da99d6bcd03a3bc2b 100644
--- a/extensions/shell/browser/shell_app_window.cc
+++ b/extensions/shell/browser/shell_app_window.cc
@@ -9,6 +9,7 @@
#include "content/public/browser/web_contents.h"
#include "extensions/browser/view_type_utils.h"
#include "extensions/common/extension_messages.h"
+#include "extensions/shell/browser/media_capture_util.h"
#include "extensions/shell/browser/shell_extension_web_contents_observer.h"
#include "ipc/ipc_message_macros.h"
@@ -17,13 +18,18 @@ using content::WebContents;
namespace extensions {
-ShellAppWindow::ShellAppWindow() {
+ShellAppWindow::ShellAppWindow() : extension_(NULL) {
}
ShellAppWindow::~ShellAppWindow() {
}
-void ShellAppWindow::Init(BrowserContext* context, gfx::Size initial_size) {
+void ShellAppWindow::Init(BrowserContext* context,
+ const Extension* extension,
+ gfx::Size initial_size) {
+ DCHECK(extension);
+ DCHECK(context);
+ extension_ = extension;
extension_function_dispatcher_.reset(
new ExtensionFunctionDispatcher(context, this));
@@ -33,6 +39,7 @@ void ShellAppWindow::Init(BrowserContext* context, gfx::Size initial_size) {
web_contents_.reset(WebContents::Create(create_params));
content::WebContentsObserver::Observe(web_contents_.get());
+ web_contents_->SetDelegate(this);
// Add support for extension startup.
ShellExtensionWebContentsObserver::CreateForWebContents(web_contents_.get());
@@ -54,6 +61,15 @@ int ShellAppWindow::GetRenderViewRoutingID() {
return web_contents_->GetRenderViewHost()->GetRoutingID();
}
+void ShellAppWindow::RequestMediaAccessPermission(
+ content::WebContents* web_contents,
+ const content::MediaStreamRequest& request,
+ const content::MediaResponseCallback& callback) {
+ // Allow access to the first microphone and/or camera.
+ media_capture_util::GrantMediaStreamRequestWithFirstDevice(
+ web_contents, request, callback, extension_);
+}
+
bool ShellAppWindow::OnMessageReceived(const IPC::Message& message) {
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(ShellAppWindow, message)
« no previous file with comments | « extensions/shell/browser/shell_app_window.h ('k') | extensions/shell/browser/shell_app_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698