Remove HostDesktopType from AppLaunchParams

chrome/browser/ui/extensions/application_launch.cc

 // Copyright (c) 2012 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/ui/extensions/application_launch.h"
 
 #include <string>
 
 #include "apps/launcher.h"
 #include "base/macros.h"
@@ skipping 38 matching lines @@
 #endif
 
 using content::WebContents;
 using extensions::Extension;
 using extensions::ExtensionPrefs;
 using extensions::ExtensionRegistry;
 
 namespace {
 
 // Shows the app list for |desktop_type| and returns the app list's window.
-gfx::NativeWindow ShowAppListAndGetNativeWindow(
-      chrome::HostDesktopType desktop_type) {
-  AppListService* app_list_service = AppListService::Get(desktop_type);
+gfx::NativeWindow ShowAppListAndGetNativeWindow() {
+  AppListService* app_list_service =
+      AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE);
   app_list_service->Show();
   return app_list_service->GetAppListWindow();
 }
 
 // Attempts to launch an app, prompting the user to enable it if necessary. If
 // a prompt is required it will be shown inside the window returned by
 // |parent_window_getter|.
 // This class manages its own lifetime.
 class EnableViaDialogFlow : public ExtensionEnableFlowDelegate {
  public:
@@ skipping 304 matching lines @@
   Profile* profile = params.profile;
 
   ExtensionService* service =
       extensions::ExtensionSystem::Get(profile)->extension_service();
   if (!service->IsExtensionEnabled(extension->id()) ||
       extensions::ExtensionRegistry::Get(profile)->GetExtensionById(
           extension->id(), extensions::ExtensionRegistry::TERMINATED)) {
   base::Callback<gfx::NativeWindow(void)> dialog_parent_window_getter;
   // TODO(pkotwicz): Figure out which window should be used as the parent for
   // the "enable application" dialog in Athena.
-  dialog_parent_window_getter =
-      base::Bind(&ShowAppListAndGetNativeWindow, params.desktop_type);
+  dialog_parent_window_getter = base::Bind(&ShowAppListAndGetNativeWindow);
     (new EnableViaDialogFlow(
         service, profile, extension->id(), dialog_parent_window_getter,
         base::Bind(base::IgnoreResult(OpenEnabledApplication), params)))->Run();
     return;
   }
 
   OpenEnabledApplication(params);
 }
 
 WebContents* OpenAppShortcutWindow(Profile* profile,
@@ skipping 12 matching lines @@
   extensions::TabHelper::FromWebContents(tab)->UpdateShortcutOnLoadComplete();
 
   return tab;
 }
 
 bool CanLaunchViaEvent(const extensions::Extension* extension) {
   const extensions::Feature* feature =
       extensions::FeatureProvider::GetAPIFeature("app.runtime");
   return feature->IsAvailableToExtension(extension).is_available();
 }