Create hosted app shims on Mac.

chrome/browser/apps/app_shim/extension_app_shim_handler_mac.cc

 // 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.
 
 #include "chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h"
 
 #include "apps/app_lifetime_monitor_factory.h"
 #include "apps/launcher.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "chrome/browser/apps/app_shim/app_shim_host_manager_mac.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/extensions/extension_enable_flow.h"
 #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h"
 #include "chrome/browser/web_applications/web_app_mac.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_metrics.h"
+#include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chrome/common/mac/app_shim_messages.h"
 #include "components/crx_file/id_util.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_registry.h"
@@ skipping 131 matching lines @@
   return AppWindowRegistry::Get(profile)->GetAppWindowsForApp(extension_id);
 }
 
 const extensions::Extension*
 ExtensionAppShimHandler::Delegate::GetAppExtension(
     Profile* profile,
     const std::string& extension_id) {
   ExtensionRegistry* registry = ExtensionRegistry::Get(profile);
   const extensions::Extension* extension =
       registry->GetExtensionById(extension_id, ExtensionRegistry::ENABLED);
-  return extension && extension->is_platform_app() ? extension : NULL;
+  return extension &&
+    (extension->is_platform_app() || extension->is_hosted_app())

[jackhou1, 2014/12/03 05:12:05]

The indentation here looks a bit awkward. Run "git cl format" to see what it
recommends.

[mitchellj, 2014/12/04 04:53:52]

Acknowledged.

+      ? extension : NULL;
 }
 
 void ExtensionAppShimHandler::Delegate::EnableExtension(
     Profile* profile,
     const std::string& extension_id,
     const base::Callback<void()>& callback) {
   (new EnableViaPrompt(profile, extension_id, callback))->Run();
 }
 
 void ExtensionAppShimHandler::Delegate::LaunchApp(
     Profile* profile,
     const extensions::Extension* extension,
     const std::vector<base::FilePath>& files) {
   extensions::RecordAppLaunchType(
       extension_misc::APP_LAUNCH_CMD_LINE_APP, extension->GetType());
+  if (extension->is_hosted_app()) {
+    AppLaunchParams launch_params(
+        profile,
+        extension,
+        NEW_FOREGROUND_TAB,
+        extensions::SOURCE_COMMAND_LINE);
+    OpenApplication(launch_params);

[jackhou1, 2014/12/03 05:12:05]

Return here since the rest of this function is specific to platform apps.

[mitchellj, 2014/12/04 04:53:52]

Done.

+  }
   if (files.empty()) {
     apps::LaunchPlatformApp(
         profile, extension, extensions::SOURCE_COMMAND_LINE);
   } else {
     for (std::vector<base::FilePath>::const_iterator it = files.begin();
          it != files.end(); ++it) {
       apps::LaunchPlatformAppWithPath(profile, extension, *it);
     }
   }
 }
@@ skipping 183 matching lines @@
   }
 
   // TODO(jeremya): Handle the case that launching the app fails. Probably we
   // need to watch for 'app successfully launched' or at least 'background page
   // exists/was created' and time out with failure if we don't see that sign of
   // life within a certain window.
   const extensions::Extension* extension =
       delegate_->GetAppExtension(profile, app_id);
   if (extension) {
     delegate_->LaunchApp(profile, extension, files);
+    // If it's a hosted app, just kill it immediately after opening for now.
+    if (extension->is_hosted_app()) {

[jackhou1, 2014/12/03 05:12:05]

No braces on single line if block.

[mitchellj, 2014/12/04 04:53:52]

Done.

+      host->OnAppLaunchComplete(APP_SHIM_LAUNCH_DUPLICATE_HOST);
+    }
     return;
   }
 
   delegate_->EnableExtension(
       profile, app_id,
       base::Bind(&ExtensionAppShimHandler::OnExtensionEnabled,
                  weak_factory_.GetWeakPtr(),
                  host->GetProfilePath(), app_id, files));
 }
 
@@ skipping 148 matching lines @@
   if (hosts_.empty())
     delegate_->MaybeTerminate();
 }
 
 void ExtensionAppShimHandler::OnAppStop(Profile* profile,
                                         const std::string& app_id) {}
 
 void ExtensionAppShimHandler::OnChromeTerminating() {}
 
 }  // namespace apps