| 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..847ddf08d7f27b423a1448bd40c5b5f551f12f77 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"
|
|
|
| @@ -33,6 +34,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 +56,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);
|
| +}
|
| +
|
| bool ShellAppWindow::OnMessageReceived(const IPC::Message& message) {
|
| bool handled = true;
|
| IPC_BEGIN_MESSAGE_MAP(ShellAppWindow, message)
|
|
|