| Index: athena/content/content_activity_factory.h
|
| diff --git a/athena/content/content_activity_factory.h b/athena/content/content_activity_factory.h
|
| index a00d6dba7806795692e642cf6a76e7f73d305c10..d3a23bae755f16576c0ed53c567131e1a1640e13 100644
|
| --- a/athena/content/content_activity_factory.h
|
| +++ b/athena/content/content_activity_factory.h
|
| @@ -21,8 +21,8 @@ class ContentActivityFactory : public ActivityFactory {
|
| const GURL& url) OVERRIDE;
|
| virtual Activity* CreateAppActivity(extensions::ShellAppWindow* app_window,
|
| const std::string& app_id) OVERRIDE;
|
| - virtual Activity* CreateAppActivity(
|
| - extensions::AppWindow* app_window) OVERRIDE;
|
| + virtual Activity* CreateAppActivity(extensions::AppWindow* app_window,
|
| + views::WebView* web_view) OVERRIDE;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(ContentActivityFactory);
|
|
|