| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_ | 5 #ifndef ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_ |
| 6 #define ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_ | 6 #define ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "athena/activity/public/activity.h" | 10 #include "athena/activity/public/activity.h" |
| 11 #include "athena/activity/public/activity_view_model.h" | 11 #include "athena/activity/public/activity_view_model.h" |
| 12 #include "athena/content/app_activity_proxy.h" | |
| 13 #include "ui/gfx/image/image_skia.h" | 12 #include "ui/gfx/image/image_skia.h" |
| 14 | 13 |
| 15 namespace athena { | 14 namespace athena { |
| 16 | 15 |
| 17 class AppActivityRegistry; | 16 class AppActivityRegistry; |
| 18 | 17 |
| 19 // This activity object is a proxy placeholder for the application while it is | 18 // This activity object is a proxy placeholder for the application while it is |
| 20 // unloaded. When selected it will launch the applciation again and destroy | 19 // unloaded. When selected it will launch the applciation again and destroy |
| 21 // itself indirectly. | 20 // itself indirectly. |
| 22 class AppActivityProxy : public Activity, | 21 class AppActivityProxy : public Activity, |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 | 53 |
| 55 // The associated view. | 54 // The associated view. |
| 56 views::View* view_; | 55 views::View* view_; |
| 57 | 56 |
| 58 DISALLOW_COPY_AND_ASSIGN(AppActivityProxy); | 57 DISALLOW_COPY_AND_ASSIGN(AppActivityProxy); |
| 59 }; | 58 }; |
| 60 | 59 |
| 61 } // namespace athena | 60 } // namespace athena |
| 62 | 61 |
| 63 #endif // ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_ | 62 #endif // ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_ |
| OLD | NEW |