Index: athena/content/app_activity.h |
diff --git a/athena/content/app_activity.h b/athena/content/app_activity.h |
index 905e9563ca224a1ac8bfba67fef0c88e830ec6d6..b0d95886f450bcde3ee8e406ce65d39ac6f541d2 100644 |
--- a/athena/content/app_activity.h |
+++ b/athena/content/app_activity.h |
@@ -29,7 +29,7 @@ class AppActivity : public Activity, |
explicit AppActivity(const std::string& app_id); |
// Gets the content proxy so that the AppProxy can take it over. |
oshima
2014/09/22 16:10:28
Does AppProxy mean AppActivityProxy?
Mr4D (OOO till 08-26)
2014/09/23 19:07:33
Done.
|
- scoped_ptr<ContentProxy> GetContentProxy(aura::Window* window); |
+ scoped_ptr<ContentProxy> GetContentProxy(); |
// Activity: |
virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE; |
@@ -46,7 +46,7 @@ class AppActivity : public Activity, |
virtual gfx::ImageSkia GetIcon() const OVERRIDE; |
virtual bool UsesFrame() const OVERRIDE; |
virtual views::View* GetContentsView() OVERRIDE; |
- virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE; |
+ virtual scoped_ptr<gfx::Image> GetOverviewModeImage() OVERRIDE; |
virtual void PrepareContentsForOverview() OVERRIDE; |
virtual void ResetContentsView() OVERRIDE; |