extensions/shell/browser/shell_desktop_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: extensions/shell/browser/shell_desktop_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: extensions/shell/browser/shell_desktop_controller.cc

diff --git a/extensions/shell/browser/shell_desktop_controller.cc b/extensions/shell/browser/shell_desktop_controller.cc

index e7d20575f15c6a8723e7ae493f4c49badb4e6760..8fff3286b90bbc5ca29b6d555888d17413293dd1 100644

--- a/extensions/shell/browser/shell_desktop_controller.cc

+++ b/extensions/shell/browser/shell_desktop_controller.cc

@@ -187,8 +187,9 @@ void ShellDesktopController::SetAppWindowController(

}

ShellAppWindow* ShellDesktopController::CreateAppWindow(

- content::BrowserContext* context) {

- return app_window_controller_->CreateAppWindow(context);

+ content::BrowserContext* context,

+ const Extension* extension) {

+ return app_window_controller_->CreateAppWindow(context, extension);

}

void ShellDesktopController::CloseAppWindows() {