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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 } | 53 } |
54 | 54 |
55 SkColor SampleActivity::GetRepresentativeColor() const { | 55 SkColor SampleActivity::GetRepresentativeColor() const { |
56 return color_; | 56 return color_; |
57 } | 57 } |
58 | 58 |
59 base::string16 SampleActivity::GetTitle() const { | 59 base::string16 SampleActivity::GetTitle() const { |
60 return title_; | 60 return title_; |
61 } | 61 } |
62 | 62 |
| 63 gfx::ImageSkia SampleActivity::GetIcon() const { |
| 64 return gfx::ImageSkia(); |
| 65 } |
| 66 |
63 bool SampleActivity::UsesFrame() const { | 67 bool SampleActivity::UsesFrame() const { |
64 return true; | 68 return true; |
65 } | 69 } |
66 | 70 |
67 views::View* SampleActivity::GetContentsView() { | 71 views::View* SampleActivity::GetContentsView() { |
68 if (!contents_view_) { | 72 if (!contents_view_) { |
69 contents_view_ = new views::View; | 73 contents_view_ = new views::View; |
70 contents_view_->set_background( | 74 contents_view_->set_background( |
71 views::Background::CreateSolidBackground(contents_color_)); | 75 views::Background::CreateSolidBackground(contents_color_)); |
72 } | 76 } |
(...skipping 12 matching lines...) Expand all Loading... |
85 } | 89 } |
86 | 90 |
87 void SampleActivity::PrepareContentsForOverview() { | 91 void SampleActivity::PrepareContentsForOverview() { |
88 } | 92 } |
89 | 93 |
90 void SampleActivity::ResetContentsView() { | 94 void SampleActivity::ResetContentsView() { |
91 } | 95 } |
92 | 96 |
93 } // namespace test | 97 } // namespace test |
94 } // namespace athena | 98 } // namespace athena |
OLD | NEW |