| 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_REGISTRY_H_ | 5 #ifndef ATHENA_CONTENT_APP_ACTIVITY_REGISTRY_H_ |
| 6 #define ATHENA_CONTENT_APP_ACTIVITY_REGISTRY_H_ | 6 #define ATHENA_CONTENT_APP_ACTIVITY_REGISTRY_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "athena/activity/public/activity_view_model.h" | 10 #include "athena/activity/public/activity_view_model.h" |
| 11 #include "athena/content/app_activity_proxy.h" | 11 #include "athena/content/app_activity_proxy.h" |
| 12 #include "ui/gfx/image/image_skia.h" |
| 12 | 13 |
| 13 namespace aura { | 14 namespace aura { |
| 14 class Window; | 15 class Window; |
| 15 } | 16 } |
| 16 | 17 |
| 17 namespace content { | 18 namespace content { |
| 18 class BrowserContext; | 19 class BrowserContext; |
| 19 } | 20 } |
| 20 | 21 |
| 21 namespace athena { | 22 namespace athena { |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 SkColor color_; | 99 SkColor color_; |
| 99 base::string16 title_; | 100 base::string16 title_; |
| 100 gfx::ImageSkia image_; | 101 gfx::ImageSkia image_; |
| 101 | 102 |
| 102 DISALLOW_COPY_AND_ASSIGN(AppActivityRegistry); | 103 DISALLOW_COPY_AND_ASSIGN(AppActivityRegistry); |
| 103 }; | 104 }; |
| 104 | 105 |
| 105 } // namespace athena | 106 } // namespace athena |
| 106 | 107 |
| 107 #endif // ATHENA_CONTENT_APP_ACTIVITY_REGISTRY_H_ | 108 #endif // ATHENA_CONTENT_APP_ACTIVITY_REGISTRY_H_ |
| OLD | NEW |