Adding Baseframework of the ResourceManager (all hooks and observers) are being put in place with a…

athena/content/app_activity_registry.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/content/app_activity_registry.h"
 
 #include "athena/activity/public/activity_manager.h"
 #include "athena/content/app_activity.h"
 #include "athena/content/app_activity_proxy.h"
 #include "athena/content/public/app_registry.h"
@@ skipping 92 matching lines @@
   if (activity_list_.empty()) {
     AppRegistry::Get()->RemoveAppActivityRegistry(this);
     // |This| is gone now.
   }
 }
 
 void AppActivityRegistry::RestartApplication(AppActivityProxy* proxy) {
   DCHECK_EQ(unloaded_activity_proxy_, proxy);
   // Restart the application.
   ExtensionsDelegate::Get(browser_context_)->LaunchApp(app_id_);
-  // Remove the activity from the Activity manager.
-  ActivityManager::Get()->RemoveActivity(unloaded_activity_proxy_);
+  // Delete the activity which will also remove the it from the ActivityManager.
   delete unloaded_activity_proxy_;  // Will call ProxyDestroyed.
   // After this call |this| might be gone if the app did not open a window yet.
 }
 
 void AppActivityRegistry::MoveBeforeMruApplicationWindow(aura::Window* window) {
   DCHECK(activity_list_.size());
   // TODO(skuhne): This needs to be changed to some kind of delegate which
   // resides in the window manager.
   const aura::Window::Windows children =
       activity_list_[0]->GetWindow()->parent()->children();;
@@ skipping 10 matching lines @@
         window->parent()->StackChildBelow(window, *child_iterator);
         window->parent()->StackChildBelow(*child_iterator, window);
         return;
       }
     }
   }
   NOTREACHED() << "The application does not get tracked by the mru list";
 }
 
 }  // namespace athena