Add the ability to load multiple apps into app_shell.

extensions/shell/browser/shell_extension_system.h

 // 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.
 
 #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_EXTENSION_SYSTEM_H_
 #define EXTENSIONS_SHELL_BROWSER_SHELL_EXTENSION_SYSTEM_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "extensions/browser/extension_system.h"
+#include "extensions/common/extension_set.h"
 #include "extensions/common/one_shot_event.h"
 
 class BrowserContextKeyedServiceFactory;
 
 namespace base {
 class FilePath;
 }
 
 namespace content {
 class BrowserContext;
 }
 
 namespace extensions {
 
 class DeclarativeUserScriptMaster;
 class EventRouter;
 class InfoMap;
 class LazyBackgroundTaskQueue;
 class ProcessManager;
 class RendererStartupHelper;
 class SharedUserScriptMaster;
 
 // A simplified version of ExtensionSystem for app_shell. Allows
 // app_shell to skip initialization of services it doesn't need.
 class ShellExtensionSystem : public ExtensionSystem {
  public:
   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);
+
+  // Initializes the extension system.

[James Cook, 2014/10/23 21:29:53]

Document the meaning of the return value.

[lfg, 2014/10/23 22:04:05]

Switched to a void function, since the return value is not used.

+  bool Init();
 
   // Launch the currently loaded app.

[James Cook, 2014/10/23 21:29:53]

Update comment please.

[lfg, 2014/10/23 22:04:05]

Done.

-  void LaunchApp();
+  void LaunchApp(const ExtensionId& extension_id);
 
   // KeyedService implementation:
   void Shutdown() override;
 
-  scoped_refptr<Extension> extension() { return extension_; }
-
   // ExtensionSystem implementation:
   void InitForRegularProfile(bool extensions_enabled) override;
   ExtensionService* extension_service() override;
   RuntimeData* runtime_data() override;
   ManagementPolicy* management_policy() override;
   SharedUserScriptMaster* shared_user_script_master() override;
   ProcessManager* process_manager() override;
   StateStore* state_store() override;
   StateStore* rules_store() override;
   InfoMap* info_map() override;
@@ skipping 12 matching lines @@
   const OneShotEvent& ready() const override;
   ContentVerifier* content_verifier() override;
   scoped_ptr<ExtensionSet> GetDependentExtensions(
       const Extension* extension) override;
   DeclarativeUserScriptMaster* GetDeclarativeUserScriptMasterByExtension(
       const ExtensionId& extension_id) override;
 
  private:
   content::BrowserContext* browser_context_;  // Not owned.
 
-  // Extension ID for the app.
-  std::string app_id_;
-
-  scoped_refptr<Extension> extension_;
+  // Set with all loaded apps.
+  ExtensionSet extensions_;
 
   // Data to be accessed on the IO thread. Must outlive process_manager_.
   scoped_refptr<InfoMap> info_map_;
 
   scoped_ptr<RuntimeData> runtime_data_;
   scoped_ptr<LazyBackgroundTaskQueue> lazy_background_task_queue_;
   scoped_ptr<EventRouter> event_router_;
   scoped_ptr<ProcessManager> process_manager_;
   scoped_ptr<QuotaService> quota_service_;
 
   // Signaled when the extension system has completed its startup tasks.
   OneShotEvent ready_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellExtensionSystem);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_SHELL_BROWSER_SHELL_EXTENSION_SYSTEM_H_