| 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 #include "athena/test/sample_activity.h" | 5 #include "athena/test/sample_activity.h" |
| 6 | 6 |
| 7 #include "ui/gfx/image/image.h" |
| 7 #include "ui/views/background.h" | 8 #include "ui/views/background.h" |
| 8 #include "ui/views/view.h" | 9 #include "ui/views/view.h" |
| 9 #include "ui/views/widget/widget.h" | 10 #include "ui/views/widget/widget.h" |
| 10 | 11 |
| 11 namespace athena { | 12 namespace athena { |
| 12 namespace test { | 13 namespace test { |
| 13 | 14 |
| 14 SampleActivity::SampleActivity(SkColor color, | 15 SampleActivity::SampleActivity(SkColor color, |
| 15 SkColor contents_color, | 16 SkColor contents_color, |
| 16 const base::string16& title) | 17 const base::string16& title) |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 contents_view_->set_background( | 75 contents_view_->set_background( |
| 75 views::Background::CreateSolidBackground(contents_color_)); | 76 views::Background::CreateSolidBackground(contents_color_)); |
| 76 } | 77 } |
| 77 return contents_view_; | 78 return contents_view_; |
| 78 } | 79 } |
| 79 | 80 |
| 80 views::Widget* SampleActivity::CreateWidget() { | 81 views::Widget* SampleActivity::CreateWidget() { |
| 81 return NULL; | 82 return NULL; |
| 82 } | 83 } |
| 83 | 84 |
| 84 gfx::ImageSkia SampleActivity::GetOverviewModeImage() { | 85 gfx::Image SampleActivity::GetOverviewModeImage() { |
| 85 return gfx::ImageSkia(); | 86 return gfx::Image(); |
| 86 } | 87 } |
| 87 | 88 |
| 88 void SampleActivity::PrepareContentsForOverview() { | 89 void SampleActivity::PrepareContentsForOverview() { |
| 89 } | 90 } |
| 90 | 91 |
| 91 void SampleActivity::ResetContentsView() { | 92 void SampleActivity::ResetContentsView() { |
| 92 } | 93 } |
| 93 | 94 |
| 94 } // namespace test | 95 } // namespace test |
| 95 } // namespace athena | 96 } // namespace athena |
| OLD | NEW |