Add the ability to load multiple apps into app_shell.

athena/extensions/shell/extensions_delegate_impl.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/extensions/public/extensions_delegate.h"
 
 #include "athena/extensions/shell/athena_shell_app_window_client.h"
 #include "base/macros.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/browser/install/extension_install_ui.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/shell/browser/shell_extension_system.h"
 
 namespace athena {
 namespace {
 
 class ShellExtensionsDelegate : public ExtensionsDelegate {
  public:
   explicit ShellExtensionsDelegate(content::BrowserContext* context)
       : context_(context),
         extension_system_(static_cast<extensions::ShellExtensionSystem*>(
             extensions::ExtensionSystem::Get(context))) {
     extensions::AppWindowClient::Set(&app_window_client_);
   }
 
   virtual ~ShellExtensionsDelegate() { extensions::AppWindowClient::Set(NULL); }
 
  private:
   // ExtensionsDelegate:
   virtual content::BrowserContext* GetBrowserContext() const override {
     return context_;
   }
   virtual const extensions::ExtensionSet& GetInstalledExtensions() override {
-    shell_extensions_.Clear();
-    if (extension_system_->extension().get())
-      shell_extensions_.Insert(extension_system_->extension());
-    return shell_extensions_;
+    return extensions::ExtensionRegistry::Get(context_)->enabled_extensions();
   }
   virtual bool LaunchApp(const std::string& app_id) override {
-    extension_system_->LaunchApp();
+    extension_system_->LaunchApp(app_id);
     return true;
   }
 
   virtual bool UnloadApp(const std::string& app_id) override { return false; }
 
   virtual scoped_ptr<extensions::ExtensionInstallUI> CreateExtensionInstallUI()
       override {
     return scoped_ptr<extensions::ExtensionInstallUI>();
   }
 
   content::BrowserContext* context_;
   extensions::ShellExtensionSystem* extension_system_;
-  extensions::ExtensionSet shell_extensions_;
 
   AthenaShellAppWindowClient app_window_client_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellExtensionsDelegate);
 };
 
 }  // namespace
 
 // static
 void ExtensionsDelegate::CreateExtensionsDelegate(
     content::BrowserContext* context) {
   new ShellExtensionsDelegate(context);
 }
 
 }  // namespace athena