Introduces --app flag to athena to load an app.

apps/shell/browser/shell_extension_system.h

 // Copyright 2013 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 APPS_SHELL_BROWSER_SHELL_EXTENSION_SYSTEM_H_
 #define APPS_SHELL_BROWSER_SHELL_EXTENSION_SYSTEM_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
@@ skipping 18 matching lines @@
 class ProcessManager;
 class RendererStartupHelper;
 
 // 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);
   virtual ~ShellExtensionSystem();
 
-  // Loads an unpacked application from a directory and attempts to launch it.
-  // Returns true on success.
-  bool LoadAndLaunchApp(const base::FilePath& app_dir);
+  // Loads an unpacked application from a directory. Returns true on success.
+  bool LoadApp(const base::FilePath& app_dir);
+
+  // Launch the currently loaded app.
+  void LaunchApp();
 
   // KeyedService implementation:
   virtual void Shutdown() OVERRIDE;
 
   // ExtensionSystem implementation:
   virtual void InitForRegularProfile(bool extensions_enabled) OVERRIDE;
   virtual ExtensionService* extension_service() OVERRIDE;
   virtual RuntimeData* runtime_data() OVERRIDE;
   virtual ManagementPolicy* management_policy() OVERRIDE;
   virtual UserScriptMaster* user_script_master() OVERRIDE;
@@ skipping 16 matching lines @@
       const UnloadedExtensionInfo::Reason reason) OVERRIDE;
   virtual const OneShotEvent& ready() const OVERRIDE;
   virtual ContentVerifier* content_verifier() OVERRIDE;
 
  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_;
 
   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  // APPS_SHELL_BROWSER_SHELL_EXTENSION_SYSTEM_H_