Add the ability to load multiple apps into app_shell.

extensions/shell/browser/shell_extension_system.h

Index: extensions/shell/browser/shell_extension_system.h
diff --git a/extensions/shell/browser/shell_extension_system.h b/extensions/shell/browser/shell_extension_system.h
index 08004cebeb599b1cb7291faa96138399182f1d1c..1fa1b726d72696eb473f58f598f23afcd8612dfb 100644
--- a/extensions/shell/browser/shell_extension_system.h
+++ b/extensions/shell/browser/shell_extension_system.h
@@ -9,6 +9,7 @@
 
 #include "base/compiler_specific.h"
 #include "extensions/browser/extension_system.h"
+#include "extensions/common/extension_set.h"

[James Cook, 2014/10/24 00:26:49]

I don't think you need this header any more.

[lfg, 2014/10/24 15:23:15]

Done.

 #include "extensions/common/one_shot_event.h"
 
 class BrowserContextKeyedServiceFactory;
@@ -38,17 +39,19 @@ class ShellExtensionSystem : public ExtensionSystem {
   explicit ShellExtensionSystem(content::BrowserContext* browser_context);
   ~ShellExtensionSystem() override;
 
-  // Loads an unpacked application from a directory. Returns true on success.
-  bool LoadApp(const base::FilePath& app_dir);
+  // Loads an unpacked application from a directory. Returns the extension on
+  // success, or null otherwise.
+  const Extension* LoadApp(const base::FilePath& app_dir);
 
-  // Launch the currently loaded app.
-  void LaunchApp();
+  // Initializes the extension system.
+  void Init();
+
+  // Launch the app with id |extension_id|.
+  void LaunchApp(const ExtensionId& extension_id);

[James Cook, 2014/10/24 00:26:49]

optional: A lot of code in extensions (most?) just uses std::string for
extension IDs. I wouldn't feel obligated to use ExtensionId here. If you decided
to keep it you should explicitly include extension.h, where it comes from.

[lfg, 2014/10/24 15:23:15]

Done.

 
   // KeyedService implementation:
   void Shutdown() override;
 
-  scoped_refptr<Extension> extension() { return extension_; }
-
   // ExtensionSystem implementation:
   void InitForRegularProfile(bool extensions_enabled) override;
   ExtensionService* extension_service() override;
@@ -81,11 +84,6 @@ class ShellExtensionSystem : public ExtensionSystem {
  private:
   content::BrowserContext* browser_context_;  // Not owned.
 
-  // Extension ID for the app.
-  std::string app_id_;
-
-  scoped_refptr<Extension> extension_;
-
   // Data to be accessed on the IO thread. Must outlive process_manager_.
   scoped_refptr<InfoMap> info_map_;