| 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_registry.h" | 7 #include "athena/content/app_activity_registry.h" |
| 8 #include "athena/wm/public/window_list_provider.h" | 8 #include "athena/wm/public/window_list_provider.h" |
| 9 #include "athena/wm/public/window_manager.h" | 9 #include "athena/wm/public/window_manager.h" |
| 10 #include "ui/aura/window.h" | 10 #include "ui/aura/window.h" |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 } | 77 } |
| 78 | 78 |
| 79 bool AppActivityProxy::UsesFrame() const { | 79 bool AppActivityProxy::UsesFrame() const { |
| 80 return true; | 80 return true; |
| 81 } | 81 } |
| 82 | 82 |
| 83 views::View* AppActivityProxy::GetContentsView() { | 83 views::View* AppActivityProxy::GetContentsView() { |
| 84 return view_; | 84 return view_; |
| 85 } | 85 } |
| 86 | 86 |
| 87 views::Widget* AppActivityProxy::CreateWidget() { |
| 88 return NULL; |
| 89 } |
| 90 |
| 87 void AppActivityProxy::CreateOverviewModeImage() { | 91 void AppActivityProxy::CreateOverviewModeImage() { |
| 88 // Nothing we can do here. | 92 // Nothing we can do here. |
| 89 } | 93 } |
| 90 | 94 |
| 91 gfx::ImageSkia AppActivityProxy::GetOverviewModeImage() { | 95 gfx::ImageSkia AppActivityProxy::GetOverviewModeImage() { |
| 92 return image_; | 96 return image_; |
| 93 } | 97 } |
| 94 | 98 |
| 95 void AppActivityProxy::PrepareContentsForOverview() { | 99 void AppActivityProxy::PrepareContentsForOverview() { |
| 96 } | 100 } |
| 97 | 101 |
| 98 void AppActivityProxy::ResetContentsView() { | 102 void AppActivityProxy::ResetContentsView() { |
| 99 } | 103 } |
| 100 | 104 |
| 101 } // namespace athena | 105 } // namespace athena |
| OLD | NEW |