| Index: athena/test/sample_activity.h
|
| diff --git a/athena/test/sample_activity.h b/athena/test/sample_activity.h
|
| index b95801cfd5c1859ccd0e6f001e31ae070eaea2b5..04745a51d73a24420d628715e53220bda3a77478 100644
|
| --- a/athena/test/sample_activity.h
|
| +++ b/athena/test/sample_activity.h
|
| @@ -15,7 +15,9 @@ namespace test {
|
| class SampleActivity : public Activity,
|
| public ActivityViewModel {
|
| public:
|
| - SampleActivity(SkColor color, SkColor content, const std::string& title);
|
| + SampleActivity(SkColor color,
|
| + SkColor contents_color,
|
| + const std::string& title);
|
| virtual ~SampleActivity();
|
|
|
| private:
|
| @@ -25,12 +27,12 @@ class SampleActivity : public Activity,
|
| // athena::ActivityViewModel:
|
| virtual SkColor GetRepresentativeColor() OVERRIDE;
|
| virtual std::string GetTitle() OVERRIDE;
|
| - virtual aura::Window* GetNativeWindow() OVERRIDE;
|
| + virtual views::View* GetContentsView() OVERRIDE;
|
|
|
| SkColor color_;
|
| - SkColor content_color_;
|
| + SkColor contents_color_;
|
| std::string title_;
|
| - scoped_ptr<aura::Window> window_;
|
| + views::View* contents_view_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SampleActivity);
|
| };
|
|
|