| 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/views/background.h" | 7 #include "ui/views/background.h" |
| 8 #include "ui/views/view.h" | 8 #include "ui/views/view.h" |
| 9 #include "ui/views/widget/widget.h" | 9 #include "ui/views/widget/widget.h" |
| 10 | 10 |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 contents_view_->set_background( | 74 contents_view_->set_background( |
| 75 views::Background::CreateSolidBackground(contents_color_)); | 75 views::Background::CreateSolidBackground(contents_color_)); |
| 76 } | 76 } |
| 77 return contents_view_; | 77 return contents_view_; |
| 78 } | 78 } |
| 79 | 79 |
| 80 views::Widget* SampleActivity::CreateWidget() { | 80 views::Widget* SampleActivity::CreateWidget() { |
| 81 return NULL; | 81 return NULL; |
| 82 } | 82 } |
| 83 | 83 |
| 84 gfx::ImageSkia SampleActivity::GetOverviewModeImage() { | 84 scoped_ptr<gfx::Image> SampleActivity::GetOverviewModeImage() { |
| 85 return gfx::ImageSkia(); | 85 return scoped_ptr<gfx::Image>(new gfx::Image()); |
| 86 } | 86 } |
| 87 | 87 |
| 88 void SampleActivity::PrepareContentsForOverview() { | 88 void SampleActivity::PrepareContentsForOverview() { |
| 89 } | 89 } |
| 90 | 90 |
| 91 void SampleActivity::ResetContentsView() { | 91 void SampleActivity::ResetContentsView() { |
| 92 } | 92 } |
| 93 | 93 |
| 94 } // namespace test | 94 } // namespace test |
| 95 } // namespace athena | 95 } // namespace athena |
| OLD | NEW |