extensions/shell/browser/default_shell_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: extensions/shell/browser/default_shell_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: extensions/shell/browser/default_shell_app_window_controller.cc

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

index 778bc094218799a98502c7bb788e10c535e75566..0fc569c2191ae5187e8ce595feae98bc7eb0a17f 100644

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

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

@@ -24,11 +24,12 @@ DefaultShellAppWindowController::~DefaultShellAppWindowController() {

}

ShellAppWindow* DefaultShellAppWindowController::CreateAppWindow(

- content::BrowserContext* context) {

+ content::BrowserContext* context,

+ const Extension* extension) {

aura::Window* root_window = shell_desktop_controller_->host()->window();

app_window_.reset(new ShellAppWindow);

- app_window_->Init(context, root_window->bounds().size());

+ app_window_->Init(context, extension, root_window->bounds().size());

// Attach the web contents view to our window hierarchy.

aura::Window* content = app_window_->GetNativeWindow();