Make management.launchApp() work for hosted apps on Athena

athena/extensions/chrome/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/activity/public/activity_factory.h"
 #include "athena/extensions/chrome/athena_chrome_app_window_client.h"
 #include "athena/extensions/chrome/athena_extension_install_ui.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "extensions/browser/extension_registry.h"
@@ skipping 51 matching lines @@
       std::string source_value =
           std::string(extension_urls::kLaunchSourceAppList);
       // Set an override URL to include the source.
       GURL extension_url =
           extensions::AppLaunchInfo::GetFullLaunchURL(extension);
       params.override_url = net::AppendQueryParameter(
           extension_url, extension_urls::kWebstoreSourceField, source_value);
     }
     params.container = extensions::LAUNCH_CONTAINER_WINDOW;
 
-    // V2 apps
-    if (CanLaunchViaEvent(extension)) {
-      OpenApplication(params);
-      return true;
-    }
-    LaunchV1App(params, extension);
+    OpenApplication(params);
     return true;
   }
 
   virtual bool UnloadApp(const std::string& app_id) override {
     // TODO(skuhne): Implement using extension service.
     return false;
   }
 
   virtual scoped_ptr<extensions::ExtensionInstallUI> CreateExtensionInstallUI()
       override {
     return scoped_ptr<extensions::ExtensionInstallUI>(
         new AthenaExtensionInstallUI());
   }
 
-  void LaunchV1App(const AppLaunchParams& params,
-                   const extensions::Extension* extension) {
-    // TODO(oshima): Just activate if the app is already running.
-    const GURL url_input = params.override_url;
-
-    DCHECK(!url_input.is_empty() || extension);
-    GURL url = UrlForExtension(extension, url_input);
-    athena::ActivityFactory::Get()->CreateWebActivity(
-        GetBrowserContext(), base::UTF8ToUTF16(extension->name()), url);
-  }
-
   // ExtensionService for the browser context this is created for.
   ExtensionService* extension_service_;
 
   // Installed extensions.
   extensions::ExtensionSet extensions_;
 
   AthenaChromeAppWindowClient app_window_client_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeExtensionsDelegate);
 };
 
 }  // namespace
 
 // static
 void ExtensionsDelegate::CreateExtensionsDelegate(
     content::BrowserContext* context) {
   new ChromeExtensionsDelegate(context);
 }
 
 }  // namespace athena