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 "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
11 | 11 |
12 namespace athena { | 12 namespace athena { |
13 namespace test { | 13 namespace test { |
14 | 14 |
15 class SampleActivity : public Activity, | 15 class SampleActivity : public Activity, |
16 public ActivityViewModel { | 16 public ActivityViewModel { |
17 public: | 17 public: |
18 SampleActivity(SkColor color, SkColor content, const std::string& title); | 18 SampleActivity(SkColor color, |
| 19 SkColor contents_color, |
| 20 const std::string& title); |
19 virtual ~SampleActivity(); | 21 virtual ~SampleActivity(); |
20 | 22 |
21 private: | 23 private: |
22 // athena::Activity: | 24 // athena::Activity: |
23 virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE; | 25 virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE; |
24 | 26 |
25 // athena::ActivityViewModel: | 27 // athena::ActivityViewModel: |
26 virtual SkColor GetRepresentativeColor() OVERRIDE; | 28 virtual SkColor GetRepresentativeColor() OVERRIDE; |
27 virtual std::string GetTitle() OVERRIDE; | 29 virtual std::string GetTitle() OVERRIDE; |
28 virtual aura::Window* GetNativeWindow() OVERRIDE; | 30 virtual views::View* GetContentsView() OVERRIDE; |
29 | 31 |
30 SkColor color_; | 32 SkColor color_; |
31 SkColor content_color_; | 33 SkColor contents_color_; |
32 std::string title_; | 34 std::string title_; |
33 scoped_ptr<aura::Window> window_; | 35 views::View* contents_view_; |
34 | 36 |
35 DISALLOW_COPY_AND_ASSIGN(SampleActivity); | 37 DISALLOW_COPY_AND_ASSIGN(SampleActivity); |
36 }; | 38 }; |
37 | 39 |
38 } // namespace test | 40 } // namespace test |
39 } // namespace athena | 41 } // namespace athena |
40 | 42 |
41 #endif // ATHENA_TEST_SAMPLE_ACTIVITY_H_ | 43 #endif // ATHENA_TEST_SAMPLE_ACTIVITY_H_ |
OLD | NEW |