| 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 | 50 |
| 51 Activity::ActivityMediaState AppActivityProxy::GetMediaState() { | 51 Activity::ActivityMediaState AppActivityProxy::GetMediaState() { |
| 52 // This proxy has never any media playing. | 52 // This proxy has never any media playing. |
| 53 return ACTIVITY_MEDIA_STATE_NONE; | 53 return ACTIVITY_MEDIA_STATE_NONE; |
| 54 } | 54 } |
| 55 | 55 |
| 56 aura::Window* AppActivityProxy::GetWindow() { | 56 aura::Window* AppActivityProxy::GetWindow() { |
| 57 return view_->GetWidget()->GetNativeWindow(); | 57 return view_->GetWidget()->GetNativeWindow(); |
| 58 } | 58 } |
| 59 | 59 |
| 60 content::WebContents* AppActivityProxy::GetWebContents() { |
| 61 return NULL; |
| 62 } |
| 63 |
| 60 void AppActivityProxy::Init() { | 64 void AppActivityProxy::Init() { |
| 61 DCHECK(replaced_activity_); | 65 DCHECK(replaced_activity_); |
| 62 // Get the content proxy to present the content. | 66 // Get the content proxy to present the content. |
| 63 content_proxy_ = replaced_activity_->GetContentProxy(GetWindow()); | 67 content_proxy_ = replaced_activity_->GetContentProxy(GetWindow()); |
| 64 WindowListProvider* window_list_provider = | 68 WindowListProvider* window_list_provider = |
| 65 WindowManager::Get()->GetWindowListProvider(); | 69 WindowManager::Get()->GetWindowListProvider(); |
| 66 window_list_provider->StackWindowBehindTo(GetWindow(), | 70 window_list_provider->StackWindowBehindTo(GetWindow(), |
| 67 replaced_activity_->GetWindow()); | 71 replaced_activity_->GetWindow()); |
| 68 // Creating this object was moving the activation to this window which should | 72 // Creating this object was moving the activation to this window which should |
| 69 // not be the active window. As such we re-activate the top activity window. | 73 // not be the active window. As such we re-activate the top activity window. |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 return content_proxy_->GetContentImage(); | 106 return content_proxy_->GetContentImage(); |
| 103 } | 107 } |
| 104 | 108 |
| 105 void AppActivityProxy::PrepareContentsForOverview() { | 109 void AppActivityProxy::PrepareContentsForOverview() { |
| 106 } | 110 } |
| 107 | 111 |
| 108 void AppActivityProxy::ResetContentsView() { | 112 void AppActivityProxy::ResetContentsView() { |
| 109 } | 113 } |
| 110 | 114 |
| 111 } // namespace athena | 115 } // namespace athena |
| OLD | NEW |