athena/main/athena_app_window_controller.cc - Issue 493453004: app_shell: Add audio and video capture support

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: athena/main/athena_app_window_controller.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) check capture permissions 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:

Index: athena/main/athena_app_window_controller.cc

diff --git a/athena/main/athena_app_window_controller.cc b/athena/main/athena_app_window_controller.cc

index a1da206b8fce334365f235b6f945b2ed9b40b195..e10a66ad252c7a4c1d5e67689c67af254834502d 100644

--- a/athena/main/athena_app_window_controller.cc

+++ b/athena/main/athena_app_window_controller.cc

@@ -19,7 +19,8 @@ AthenaAppWindowController::~AthenaAppWindowController() {

}

extensions::ShellAppWindow* AthenaAppWindowController::CreateAppWindow(

- content::BrowserContext* context) {

+ content::BrowserContext* context,

+ const extensions::Extension* extension) {

extensions::ShellAppWindow* app_window = new extensions::ShellAppWindow();

app_window->Init(context, gfx::Size(100, 100));

ActivityManager::Get()->AddActivity(ActivityFactory::Get()->CreateAppActivity(