Delete activity upon window deletion

athena/activity/activity_manager_impl.cc

Index: athena/activity/activity_manager_impl.cc
diff --git a/athena/activity/activity_manager_impl.cc b/athena/activity/activity_manager_impl.cc
index 32db67203413b582d056457eff74274cddd5922b..09dd4785af07f76ab8039601c9a1cf4a16f998fe 100644
--- a/athena/activity/activity_manager_impl.cc
+++ b/athena/activity/activity_manager_impl.cc
@@ -2,10 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "athena/activity/public/activity_manager.h"
+#include "athena/activity/activity_manager_impl.h"
 
 #include <algorithm>
-#include <vector>
 
 #include "athena/activity/public/activity.h"
 #include "athena/activity/public/activity_view_manager.h"
@@ -17,54 +16,43 @@ namespace {
 
 ActivityManager* instance = NULL;
 
-class ActivityManagerImpl : public ActivityManager {
- public:
-  ActivityManagerImpl() {
-    CHECK(!instance);
-    instance = this;
-  }
-  virtual ~ActivityManagerImpl() {
-    while (!activities_.empty())
-      delete activities_.front();
+}  // namespace
 
-    CHECK_EQ(this, instance);
-    instance = NULL;
-  }
+ActivityManagerImpl::ActivityManagerImpl() {
+  CHECK(!instance);
+  instance = this;
+}
 
-  // ActivityManager:
-  virtual void AddActivity(Activity* activity) OVERRIDE {
-    CHECK(activities_.end() == std::find(activities_.begin(),
-                                         activities_.end(),
-                                         activity));
-    activities_.push_back(activity);
-    ActivityViewManager* manager = ActivityViewManager::Get();
-    manager->AddActivity(activity);
-  }
+ActivityManagerImpl::~ActivityManagerImpl() {
+  while (!activities_.empty())
+    delete activities_.front();
 
-  virtual void RemoveActivity(Activity* activity) OVERRIDE {
-    std::vector<Activity*>::iterator find = std::find(activities_.begin(),
-                                                      activities_.end(),
-                                                      activity);
-    if (find != activities_.end()) {
-      activities_.erase(find);
+  CHECK_EQ(this, instance);
+  instance = NULL;
+}
 
-      ActivityViewManager* manager = ActivityViewManager::Get();
-      manager->RemoveActivity(activity);
-    }
-  }
+void ActivityManagerImpl::AddActivity(Activity* activity) {
+  CHECK(activities_.end() ==
+        std::find(activities_.begin(), activities_.end(), activity));
+  activities_.push_back(activity);
+  ActivityViewManager* manager = ActivityViewManager::Get();
+  manager->AddActivity(activity);
+}
 
-  virtual void UpdateActivity(Activity* activity) OVERRIDE {
+void ActivityManagerImpl::RemoveActivity(Activity* activity) {
+  std::vector<Activity*>::iterator find =
+      std::find(activities_.begin(), activities_.end(), activity);
+  if (find != activities_.end()) {
+    activities_.erase(find);
     ActivityViewManager* manager = ActivityViewManager::Get();
-    manager->UpdateActivity(activity);
+    manager->RemoveActivity(activity);
   }
+}
 
- private:
-  std::vector<Activity*> activities_;
-
-  DISALLOW_COPY_AND_ASSIGN(ActivityManagerImpl);
-};
-
-}  // namespace
+void ActivityManagerImpl::UpdateActivity(Activity* activity) {
+  ActivityViewManager* manager = ActivityViewManager::Get();
+  manager->UpdateActivity(activity);
+}
 
 // static
 ActivityManager* ActivityManager::Create() {