| Index: athena/content/app_activity.h
|
| diff --git a/athena/content/app_activity.h b/athena/content/app_activity.h
|
| index 6406a62a8ce78211cbc42f8b1278ff71f8f8c3a2..cc1a0c8157f11bdd0cc182873a04abd3be50e5ca 100644
|
| --- a/athena/content/app_activity.h
|
| +++ b/athena/content/app_activity.h
|
| @@ -10,7 +10,6 @@
|
| #include "athena/content/app_activity_proxy.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "content/public/browser/web_contents_observer.h"
|
| -#include "ui/gfx/image/image_skia.h"
|
|
|
| namespace extensions {
|
| class AppWindow;
|
| @@ -33,8 +32,8 @@ class AppActivity : public Activity,
|
| public:
|
| AppActivity(extensions::AppWindow* app_window, views::WebView* web_view);
|
|
|
| - // Gets the content proxy so that the AppProxy can take it over.
|
| - scoped_ptr<ContentProxy> GetContentProxy(aura::Window* window);
|
| + // Gets the content proxy so that the AppActivityProxy can take it over.
|
| + scoped_ptr<ContentProxy> GetContentProxy();
|
|
|
| // Activity:
|
| virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE;
|
|
|