Consolidate AppControllDelegate to ExtensionsDelegate

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_content_control_delegate.h"
 #include "athena/content/public/app_registry.h"
+#include "athena/extensions/public/extensions_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace athena {
 
 AppActivityRegistry::AppActivityRegistry(
     const std::string& app_id,
     content::BrowserContext* browser_context) :
       app_id_(app_id),
@@ skipping 62 matching lines @@
   unloaded_activity_proxy_ =
       new AppActivityProxy(activity_list_[0]->GetActivityViewModel(), this);
   ActivityManager::Get()->AddActivity(unloaded_activity_proxy_);
   // The new activity should be in the place of the most recently used app
   // window. To get it there, we get the most recently used application window
   // and place the proxy activities window in front or behind, so that when the
   // activity disappears it takes its place.
   MoveBeforeMruApplicationWindow(unloaded_activity_proxy_->GetWindow());
 
   // Unload the application. This operation will be asynchronous.
-  if (!AppRegistry::Get()->GetDelegate()->UnloadApplication(app_id_,
-                                                            browser_context_)) {
+  if (!ExtensionsDelegate::Get(browser_context_)->UnloadApp(app_id_)) {
     while(!activity_list_.empty())
       delete activity_list_.back();
   }
 }
 
 void AppActivityRegistry::ProxyDestroyed(AppActivityProxy* proxy) {
   DCHECK_EQ(unloaded_activity_proxy_, proxy);
   unloaded_activity_proxy_ = NULL;
   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.
-  AppRegistry::Get()->GetDelegate()->RestartApplication(app_id_,
-                                                        browser_context_);
+  ExtensionsDelegate::Get(browser_context_)->LaunchApp(app_id_);
   // Remove the activity from the Activity manager.
   ActivityManager::Get()->RemoveActivity(unloaded_activity_proxy_);
   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.
@@ skipping 12 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