| 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_TEST_SAMPLE_ACTIVITY_H_ | 5 #ifndef ATHENA_TEST_SAMPLE_ACTIVITY_H_ |
| 6 #define ATHENA_TEST_SAMPLE_ACTIVITY_H_ | 6 #define ATHENA_TEST_SAMPLE_ACTIVITY_H_ |
| 7 | 7 |
| 8 #include "athena/activity/public/activity.h" | 8 #include "athena/activity/public/activity.h" |
| 9 #include "athena/activity/public/activity_view_model.h" | 9 #include "athena/activity/public/activity_view_model.h" |
| 10 #include "ui/gfx/image/image_skia.h" | 10 |
| 11 namespace gfx { |
| 12 class ImageSkia; |
| 13 } |
| 11 | 14 |
| 12 namespace athena { | 15 namespace athena { |
| 13 namespace test { | 16 namespace test { |
| 14 | 17 |
| 15 class SampleActivity : public Activity, | 18 class SampleActivity : public Activity, |
| 16 public ActivityViewModel { | 19 public ActivityViewModel { |
| 17 public: | 20 public: |
| 18 SampleActivity(SkColor color, | 21 SampleActivity(SkColor color, |
| 19 SkColor contents_color, | 22 SkColor contents_color, |
| 20 const base::string16& title); | 23 const base::string16& title); |
| (...skipping 28 matching lines...) Expand all Loading... |
| 49 // The current state for this activity. | 52 // The current state for this activity. |
| 50 ActivityState current_state_; | 53 ActivityState current_state_; |
| 51 | 54 |
| 52 DISALLOW_COPY_AND_ASSIGN(SampleActivity); | 55 DISALLOW_COPY_AND_ASSIGN(SampleActivity); |
| 53 }; | 56 }; |
| 54 | 57 |
| 55 } // namespace test | 58 } // namespace test |
| 56 } // namespace athena | 59 } // namespace athena |
| 57 | 60 |
| 58 #endif // ATHENA_TEST_SAMPLE_ACTIVITY_H_ | 61 #endif // ATHENA_TEST_SAMPLE_ACTIVITY_H_ |
| OLD | NEW |