| Index: athena/content/app_activity_proxy.h
|
| diff --git a/athena/content/app_activity_proxy.h b/athena/content/app_activity_proxy.h
|
| index a8193cc9c100718edd5082014e49436dd499d16f..6586837bf105473300f8676d103f34c8d62d4956 100644
|
| --- a/athena/content/app_activity_proxy.h
|
| +++ b/athena/content/app_activity_proxy.h
|
| @@ -29,10 +29,7 @@ class AppActivityProxy : public Activity,
|
| AppActivityProxy(AppActivity* replaced_activity,
|
| AppActivityRegistry* creator);
|
|
|
| - protected:
|
| - ~AppActivityProxy() override;
|
| -
|
| - // Activity overrides:
|
| + // Activity overrides:
|
| ActivityViewModel* GetActivityViewModel() override;
|
| void SetCurrentState(ActivityState state) override;
|
| ActivityState GetCurrentState() override;
|
| @@ -53,6 +50,9 @@ class AppActivityProxy : public Activity,
|
| void PrepareContentsForOverview() override;
|
| void ResetContentsView() override;
|
|
|
| + protected:
|
| + ~AppActivityProxy() override;
|
| +
|
| private:
|
| // The creator of this object which needs to be informed if the object gets
|
| // destroyed or the application should get restarted.
|
|
|