Remove apps_launch.

BUG=1061843

Change-Id: I25a5dc2f46bab171ea48b38c5b2a6824e84a2ee8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2123576Reviewed-by: Dominick Ng <dominickn@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Nancy Wang <nancylingwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#755342}

chrome/browser/apps/BUILD.gn

-# Copyright 2018 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.
-
-import("//extensions/buildflags/buildflags.gni")
-
-# TODO(loyso): Remove this assertion. apps/ will be based off-extensions.
-assert(enable_extensions)
-
-source_set("apps") {
-  sources = [
-    "apps_launch.cc",
-    "apps_launch.h",
-  ]
-
-  deps = [ "//chrome/browser/apps/platform_apps" ]
-
-  configs += [ "//build/config/compiler:wexit_time_destructors" ]
-}

chrome/browser/apps/app_service/browser_app_launcher.cc

@@ -29,13 +29,10 @@ BrowserAppLauncher::~BrowserAppLauncher() = default;
 
 void BrowserAppLauncher::LaunchAppWithCallback(
     const std::string& app_id,
+    const base::CommandLine& command_line,
     const base::FilePath& current_directory,
     base::OnceCallback<void(Browser* browser,
                             apps::mojom::LaunchContainer container)> callback) {
-  // TODO(crbug.com/1061843): Remove command_line from AppLaunchParams, and get
-  // command line from the current process in GetLaunchFilesFromCommandLine
-  auto& command_line = *base::CommandLine::ForCurrentProcess();
-
   // old-style app shortcuts
   if (app_id.empty()) {
     ::LaunchAppWithCallback(profile_, app_id, command_line, current_directory,

chrome/browser/apps/app_service/browser_app_launcher.h

@@ -15,6 +15,7 @@ class Browser;
 class Profile;
 
 namespace base {
+class CommandLine;
 class FilePath;
 }  // namespace base
 
@@ -45,6 +46,7 @@ class BrowserAppLauncher {
   // browser window was opened.
   void LaunchAppWithCallback(
       const std::string& app_id,
+      const base::CommandLine& command_line,
       const base::FilePath& current_directory,
       base::OnceCallback<void(Browser* browser,
                               apps::mojom::LaunchContainer container)>

chrome/browser/apps/apps_launch.cc

-// Copyright 2018 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/apps_launch.h"
-
-#include "chrome/browser/apps/platform_apps/platform_app_launch.h"
-
-namespace apps {
-
-bool OpenApplicationWithReenablePrompt(
-    Profile* profile,
-    const std::string& app_id,
-    const base::CommandLine& command_line,
-    const base::FilePath& current_directory) {
-  return OpenExtensionApplicationWithReenablePrompt(
-      profile, app_id, command_line, current_directory);
-}
-
-content::WebContents* OpenAppShortcutWindow(Profile* profile, const GURL& url) {
-  return OpenExtensionAppShortcutWindow(profile, url);
-}
-
-}  // namespace apps

chrome/browser/apps/apps_launch.h

-// Copyright 2018 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 CHROME_BROWSER_APPS_APPS_LAUNCH_H_
-#define CHROME_BROWSER_APPS_APPS_LAUNCH_H_
-
-#include <string>
-
-class GURL;
-class Profile;
-
-namespace base {
-class CommandLine;
-class FilePath;
-}  // namespace base
-
-namespace content {
-class WebContents;
-}  // namespace content
-
-namespace apps {
-
-// TODO(crbug.com/966288): Move these methods into LaunchService.
-
-// Tries to open |app_id|, and prompts the user if the app is disabled. Returns
-// true if the app was successfully opened and false otherwise.
-bool OpenApplicationWithReenablePrompt(Profile* profile,
-                                       const std::string& app_id,
-                                       const base::CommandLine& command_line,
-                                       const base::FilePath& current_directory);
-
-// Returns web contents if |url| was successfully opened in a window, and
-// nullptr otherwise.
-content::WebContents* OpenAppShortcutWindow(Profile* profile, const GURL& url);
-
-}  // namespace apps
-
-#endif  // CHROME_BROWSER_APPS_APPS_LAUNCH_H_

chrome/browser/ui/BUILD.gn

@@ -4031,7 +4031,6 @@ jumbo_static_library("ui") {
   if (enable_extensions) {
     deps += [
       "//apps",
-      "//chrome/browser/apps",
       "//chrome/browser/apps/platform_apps",  # TODO(loyso): Remove this dep.
       "//chrome/browser/apps/platform_apps/api",
       "//chrome/browser/extensions",

chrome/browser/ui/startup/startup_browser_creator_impl.cc

@@ -27,8 +27,8 @@
 #include "build/build_config.h"
 #include "chrome/browser/apps/app_service/app_service_proxy.h"
 #include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
-#include "chrome/browser/apps/apps_launch.h"
 #include "chrome/browser/apps/platform_apps/install_chrome_app.h"
+#include "chrome/browser/apps/platform_apps/platform_app_launch.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
@@ -403,8 +403,8 @@ bool StartupBrowserCreatorImpl::Launch(Profile* profile,
     std::string app_id = command_line_.GetSwitchValueASCII(switches::kAppId);
     // If |app_id| is a disabled or terminated platform app we handle it
     // specially here, otherwise it will be handled below.
-    if (apps::OpenApplicationWithReenablePrompt(profile, app_id, command_line_,
-                                                cur_dir_)) {
+    if (apps::OpenExtensionApplicationWithReenablePrompt(
+            profile, app_id, command_line_, cur_dir_)) {
       return true;
     }
   }
@@ -583,7 +583,7 @@ bool StartupBrowserCreatorImpl::MaybeLaunchApplication(Profile* profile) {
     // Opens an empty browser window if the app_id is invalid.
     apps::AppServiceProxyFactory::GetForProfile(profile)
         ->BrowserAppLauncher()
-        .LaunchAppWithCallback(app_id, cur_dir_,
+        .LaunchAppWithCallback(app_id, command_line_, cur_dir_,
                                base::BindOnce(&FinalizeWebAppLaunch));
     return true;
   }
@@ -603,7 +603,7 @@ bool StartupBrowserCreatorImpl::MaybeLaunchApplication(Profile* profile) {
     if (policy->IsWebSafeScheme(url.scheme()) ||
         url.SchemeIs(url::kFileScheme)) {
       const content::WebContents* web_contents =
-          apps::OpenAppShortcutWindow(profile, url);
+          apps::OpenExtensionAppShortcutWindow(profile, url);
       if (web_contents) {
         FinalizeWebAppLaunch(
             chrome::FindBrowserWithWebContents(web_contents),