Chromium Code Reviews| 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/activity/public/activity.h" | 5 #include "athena/activity/public/activity.h" |
| 6 | 6 |
| 7 #include "athena/activity/public/activity_manager.h" | 7 #include "athena/activity/public/activity_manager.h" |
| 8 | 8 |
| 9 namespace athena { | 9 namespace athena { |
| 10 | 10 |
| 11 Activity::~Activity() { | 11 // static |
| 12 ActivityManager::Get()->RemoveActivity(this); | 12 void Activity::CloseActivity(Activity* activity) { |
| 13 ActivityManager::Get()->RemoveActivity(activity); | |
| 14 delete activity; | |
|
oshima
2014/09/04 16:39:23
Maybe we should just have
ActivityManager::Delete
Mr4D (OOO till 08-26)
2014/09/04 19:10:57
During destruction a pure virtual call occured ins
| |
| 13 } | 15 } |
| 14 | 16 |
| 15 } // namespace athena | 17 } // namespace athena |
| OLD | NEW |