athena/main/athena_app_window_controller.h - 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.h

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.h

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

index ea2c17292d000f5c61a707ec115de97d62fa01d5..24673a0f63349e77f7c03f9a901e99fedee4527e 100644

--- a/athena/main/athena_app_window_controller.h

+++ b/athena/main/athena_app_window_controller.h

@@ -19,7 +19,8 @@ class AthenaAppWindowController : public extensions::ShellAppWindowController {

// Overridden from extensions::ShellAppWindowController:

virtual extensions::ShellAppWindow* CreateAppWindow(

- content::BrowserContext* context) OVERRIDE;

+ content::BrowserContext* context,

+ const extensions::Extension* extension) OVERRIDE;

virtual void CloseAppWindows() OVERRIDE;

private: