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_proxy.h" | 5 #include "athena/content/app_activity_proxy.h" |
6 | 6 |
7 #include "athena/content/app_activity.h" | 7 #include "athena/content/app_activity.h" |
8 #include "athena/content/app_activity_registry.h" | 8 #include "athena/content/app_activity_registry.h" |
9 #include "athena/wm/public/window_list_provider.h" | 9 #include "athena/wm/public/window_list_provider.h" |
10 #include "athena/wm/public/window_manager.h" | 10 #include "athena/wm/public/window_manager.h" |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 } | 77 } |
78 | 78 |
79 base::string16 AppActivityProxy::GetTitle() const { | 79 base::string16 AppActivityProxy::GetTitle() const { |
80 return title_; | 80 return title_; |
81 } | 81 } |
82 | 82 |
83 gfx::ImageSkia AppActivityProxy::GetIcon() const { | 83 gfx::ImageSkia AppActivityProxy::GetIcon() const { |
84 return gfx::ImageSkia(); | 84 return gfx::ImageSkia(); |
85 } | 85 } |
86 | 86 |
| 87 void AppActivityProxy::SetActivityView(ActivityView* view) { |
| 88 } |
| 89 |
87 bool AppActivityProxy::UsesFrame() const { | 90 bool AppActivityProxy::UsesFrame() const { |
88 return true; | 91 return true; |
89 } | 92 } |
90 | 93 |
91 views::View* AppActivityProxy::GetContentsView() { | 94 views::View* AppActivityProxy::GetContentsView() { |
92 return view_; | 95 return view_; |
93 } | 96 } |
94 | 97 |
95 gfx::ImageSkia AppActivityProxy::GetOverviewModeImage() { | 98 gfx::ImageSkia AppActivityProxy::GetOverviewModeImage() { |
96 return content_proxy_->GetContentImage(); | 99 return content_proxy_->GetContentImage(); |
97 } | 100 } |
98 | 101 |
99 void AppActivityProxy::PrepareContentsForOverview() { | 102 void AppActivityProxy::PrepareContentsForOverview() { |
100 } | 103 } |
101 | 104 |
102 void AppActivityProxy::ResetContentsView() { | 105 void AppActivityProxy::ResetContentsView() { |
103 } | 106 } |
104 | 107 |
105 AppActivityProxy::~AppActivityProxy() { | 108 AppActivityProxy::~AppActivityProxy() { |
106 app_activity_registry_->ProxyDestroyed(this); | 109 app_activity_registry_->ProxyDestroyed(this); |
107 } | 110 } |
108 | 111 |
109 } // namespace athena | 112 } // namespace athena |
OLD | NEW |