| 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 "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 24 matching lines...) Expand all Loading... |
| 35 return; | 35 return; |
| 36 app_activity_registry_->RestartApplication(this); | 36 app_activity_registry_->RestartApplication(this); |
| 37 // Note: This object is now destroyed. | 37 // Note: This object is now destroyed. |
| 38 } | 38 } |
| 39 | 39 |
| 40 Activity::ActivityState AppActivityProxy::GetCurrentState() { | 40 Activity::ActivityState AppActivityProxy::GetCurrentState() { |
| 41 return ACTIVITY_UNLOADED; | 41 return ACTIVITY_UNLOADED; |
| 42 } | 42 } |
| 43 | 43 |
| 44 bool AppActivityProxy::IsVisible() { | 44 bool AppActivityProxy::IsVisible() { |
| 45 return true; | 45 return false; |
| 46 } | 46 } |
| 47 | 47 |
| 48 Activity::ActivityMediaState AppActivityProxy::GetMediaState() { | 48 Activity::ActivityMediaState AppActivityProxy::GetMediaState() { |
| 49 // This proxy has never any media playing. | 49 // This proxy has never any media playing. |
| 50 return ACTIVITY_MEDIA_STATE_NONE; | 50 return ACTIVITY_MEDIA_STATE_NONE; |
| 51 } | 51 } |
| 52 | 52 |
| 53 aura::Window* AppActivityProxy::GetWindow() { | 53 aura::Window* AppActivityProxy::GetWindow() { |
| 54 return view_->GetWidget()->GetNativeWindow(); | 54 return view_->GetWidget()->GetNativeWindow(); |
| 55 } | 55 } |
| (...skipping 19 matching lines...) Expand all Loading... |
| 75 | 75 |
| 76 void AppActivityProxy::CreateOverviewModeImage() { | 76 void AppActivityProxy::CreateOverviewModeImage() { |
| 77 // Nothing we can do here. | 77 // Nothing we can do here. |
| 78 } | 78 } |
| 79 | 79 |
| 80 gfx::ImageSkia AppActivityProxy::GetOverviewModeImage() { | 80 gfx::ImageSkia AppActivityProxy::GetOverviewModeImage() { |
| 81 return image_; | 81 return image_; |
| 82 } | 82 } |
| 83 | 83 |
| 84 } // namespace athena | 84 } // namespace athena |
| OLD | NEW |