| 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/content_proxy.h" | 9 #include "athena/content/content_proxy.h" |
| 10 #include "athena/content/public/app_registry.h" | 10 #include "athena/content/public/app_registry.h" |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 return !web_view_ ? NULL : web_view_->GetWidget()->GetNativeWindow(); | 96 return !web_view_ ? NULL : web_view_->GetWidget()->GetNativeWindow(); |
| 97 } | 97 } |
| 98 | 98 |
| 99 void AppActivity::Init() { | 99 void AppActivity::Init() { |
| 100 DCHECK(app_activity_registry_); | 100 DCHECK(app_activity_registry_); |
| 101 Activity* app_proxy = app_activity_registry_->unloaded_activity_proxy(); | 101 Activity* app_proxy = app_activity_registry_->unloaded_activity_proxy(); |
| 102 if (app_proxy) { | 102 if (app_proxy) { |
| 103 // Note: At this time the |AppActivity| did not get registered to the | 103 // Note: At this time the |AppActivity| did not get registered to the |
| 104 // |ResourceManager| - so we can move it around if needed. | 104 // |ResourceManager| - so we can move it around if needed. |
| 105 WindowListProvider* window_list_provider = | 105 WindowListProvider* window_list_provider = |
| 106 WindowManager::GetInstance()->GetWindowListProvider(); | 106 WindowManager::Get()->GetWindowListProvider(); |
| 107 window_list_provider->StackWindowFrontOf(app_proxy->GetWindow(), | 107 window_list_provider->StackWindowFrontOf(app_proxy->GetWindow(), |
| 108 GetWindow()); | 108 GetWindow()); |
| 109 Activity::Delete(app_proxy); | 109 Activity::Delete(app_proxy); |
| 110 // With the removal the object, the proxy should be deleted. | 110 // With the removal the object, the proxy should be deleted. |
| 111 DCHECK(!app_activity_registry_->unloaded_activity_proxy()); | 111 DCHECK(!app_activity_registry_->unloaded_activity_proxy()); |
| 112 } | 112 } |
| 113 } | 113 } |
| 114 | 114 |
| 115 SkColor AppActivity::GetRepresentativeColor() const { | 115 SkColor AppActivity::GetRepresentativeColor() const { |
| 116 // TODO(sad): Compute the color from the favicon. | 116 // TODO(sad): Compute the color from the favicon. |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 void AppActivity::HideContentProxy() { | 209 void AppActivity::HideContentProxy() { |
| 210 content_proxy_.reset(); | 210 content_proxy_.reset(); |
| 211 } | 211 } |
| 212 | 212 |
| 213 void AppActivity::ShowContentProxy() { | 213 void AppActivity::ShowContentProxy() { |
| 214 if (!content_proxy_.get() && web_view_) | 214 if (!content_proxy_.get() && web_view_) |
| 215 content_proxy_.reset(new ContentProxy(web_view_, this)); | 215 content_proxy_.reset(new ContentProxy(web_view_, this)); |
| 216 } | 216 } |
| 217 | 217 |
| 218 } // namespace athena | 218 } // namespace athena |
| OLD | NEW |