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 27 matching lines...) Expand all Loading... |
38 | 38 |
39 bool SampleActivity::IsVisible() { | 39 bool SampleActivity::IsVisible() { |
40 return contents_view_ && contents_view_->IsDrawn(); | 40 return contents_view_ && contents_view_->IsDrawn(); |
41 } | 41 } |
42 | 42 |
43 Activity::ActivityMediaState SampleActivity::GetMediaState() { | 43 Activity::ActivityMediaState SampleActivity::GetMediaState() { |
44 return Activity::ACTIVITY_MEDIA_STATE_NONE; | 44 return Activity::ACTIVITY_MEDIA_STATE_NONE; |
45 } | 45 } |
46 | 46 |
47 aura::Window* SampleActivity::GetWindow() { | 47 aura::Window* SampleActivity::GetWindow() { |
48 return | 48 return !contents_view_ ? NULL |
49 !contents_view_ ? NULL : contents_view_->GetWidget()->GetNativeWindow(); | 49 : contents_view_->GetWidget()->GetNativeWindow(); |
| 50 } |
| 51 |
| 52 content::WebContents* SampleActivity::GetWebContents() { |
| 53 return NULL; |
50 } | 54 } |
51 | 55 |
52 void SampleActivity::Init() { | 56 void SampleActivity::Init() { |
53 } | 57 } |
54 | 58 |
55 SkColor SampleActivity::GetRepresentativeColor() const { | 59 SkColor SampleActivity::GetRepresentativeColor() const { |
56 return color_; | 60 return color_; |
57 } | 61 } |
58 | 62 |
59 base::string16 SampleActivity::GetTitle() const { | 63 base::string16 SampleActivity::GetTitle() const { |
(...skipping 26 matching lines...) Expand all Loading... |
86 } | 90 } |
87 | 91 |
88 void SampleActivity::PrepareContentsForOverview() { | 92 void SampleActivity::PrepareContentsForOverview() { |
89 } | 93 } |
90 | 94 |
91 void SampleActivity::ResetContentsView() { | 95 void SampleActivity::ResetContentsView() { |
92 } | 96 } |
93 | 97 |
94 } // namespace test | 98 } // namespace test |
95 } // namespace athena | 99 } // namespace athena |
OLD | NEW |