Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(347)

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) rebase 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/main/athena_app_window_controller.h ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..5e01798833d790cc3d2a6b7c1805546e0bdbbff6 100644
--- a/athena/main/athena_app_window_controller.cc
+++ b/athena/main/athena_app_window_controller.cc
@@ -19,9 +19,10 @@ 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));
+ app_window->Init(context, extension, gfx::Size(100, 100));
ActivityManager::Get()->AddActivity(ActivityFactory::Get()->CreateAppActivity(
app_window));
return app_window;
« no previous file with comments | « athena/main/athena_app_window_controller.h ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698