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/content/app_activity.h" | 5 #include "athena/content/app_activity.h" |
6 | 6 |
7 #include "athena/activity/public/activity_manager.h" | 7 #include "athena/activity/public/activity_manager.h" |
8 #include "athena/content/app_activity_registry.h" | 8 #include "athena/content/app_activity_registry.h" |
9 #include "athena/content/public/app_registry.h" | 9 #include "athena/content/public/app_registry.h" |
10 #include "athena/wm/public/window_list_provider.h" | 10 #include "athena/wm/public/window_list_provider.h" |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 | 103 |
104 SkColor AppActivity::GetRepresentativeColor() const { | 104 SkColor AppActivity::GetRepresentativeColor() const { |
105 // TODO(sad): Compute the color from the favicon. | 105 // TODO(sad): Compute the color from the favicon. |
106 return SK_ColorGRAY; | 106 return SK_ColorGRAY; |
107 } | 107 } |
108 | 108 |
109 base::string16 AppActivity::GetTitle() const { | 109 base::string16 AppActivity::GetTitle() const { |
110 return web_view_->GetWebContents()->GetTitle(); | 110 return web_view_->GetWebContents()->GetTitle(); |
111 } | 111 } |
112 | 112 |
| 113 gfx::ImageSkia AppActivity::GetIcon() const { |
| 114 return gfx::ImageSkia(); |
| 115 } |
| 116 |
113 bool AppActivity::UsesFrame() const { | 117 bool AppActivity::UsesFrame() const { |
114 return false; | 118 return false; |
115 } | 119 } |
116 | 120 |
117 views::View* AppActivity::GetContentsView() { | 121 views::View* AppActivity::GetContentsView() { |
118 if (!web_view_) { | 122 if (!web_view_) { |
119 web_view_ = GetWebView(); | 123 web_view_ = GetWebView(); |
120 // Make sure the content gets properly shown. | 124 // Make sure the content gets properly shown. |
121 if (current_state_ == ACTIVITY_VISIBLE) { | 125 if (current_state_ == ACTIVITY_VISIBLE) { |
122 MakeVisible(); | 126 MakeVisible(); |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
208 overview_mode_image_ = gfx::ImageSkia(); | 212 overview_mode_image_ = gfx::ImageSkia(); |
209 } | 213 } |
210 // Now we can hide this. | 214 // Now we can hide this. |
211 // Note: This might have to be done asynchronously after the readback took | 215 // Note: This might have to be done asynchronously after the readback took |
212 // place. | 216 // place. |
213 web_view_->SetVisible(false); | 217 web_view_->SetVisible(false); |
214 web_view_->GetWebContents()->GetNativeView()->Hide(); | 218 web_view_->GetWebContents()->GetNativeView()->Hide(); |
215 } | 219 } |
216 | 220 |
217 } // namespace athena | 221 } // namespace athena |
OLD | NEW |