| 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 | 66 |
| 67 views::View* SampleActivity::GetContentsView() { | 67 views::View* SampleActivity::GetContentsView() { |
| 68 if (!contents_view_) { | 68 if (!contents_view_) { |
| 69 contents_view_ = new views::View; | 69 contents_view_ = new views::View; |
| 70 contents_view_->set_background( | 70 contents_view_->set_background( |
| 71 views::Background::CreateSolidBackground(contents_color_)); | 71 views::Background::CreateSolidBackground(contents_color_)); |
| 72 } | 72 } |
| 73 return contents_view_; | 73 return contents_view_; |
| 74 } | 74 } |
| 75 | 75 |
| 76 views::Widget* SampleActivity::CreateWidget() { |
| 77 return NULL; |
| 78 } |
| 79 |
| 76 void SampleActivity::CreateOverviewModeImage() { | 80 void SampleActivity::CreateOverviewModeImage() { |
| 77 } | 81 } |
| 78 | 82 |
| 79 gfx::ImageSkia SampleActivity::GetOverviewModeImage() { | 83 gfx::ImageSkia SampleActivity::GetOverviewModeImage() { |
| 80 return gfx::ImageSkia(); | 84 return gfx::ImageSkia(); |
| 81 } | 85 } |
| 82 | 86 |
| 83 void SampleActivity::PrepareContentsForOverview() { | 87 void SampleActivity::PrepareContentsForOverview() { |
| 84 } | 88 } |
| 85 | 89 |
| 86 void SampleActivity::ResetContentsView() { | 90 void SampleActivity::ResetContentsView() { |
| 87 } | 91 } |
| 88 | 92 |
| 89 } // namespace test | 93 } // namespace test |
| 90 } // namespace athena | 94 } // namespace athena |
| OLD | NEW |