Convert and get the correct launch source for LaunchApp.

ChromeLauncherController::LaunchApp could be called from
AppServiceAppItem::Activate, which is not from Shelf as the launch
source, so convert and get the correct launch source from the LaunchApp
function's parameter.

BUG=1043205

Change-Id: I9ca32bc50340b861938afffadfd5c8a823d83f15
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2066503Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Nancy Wang <nancylingwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#744073}

chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc

@@ -418,9 +418,10 @@ IN_PROC_BROWSER_TEST_P(ArcAppDeferredLauncherWithParamsBrowserTest,
 
   // Launching non-ready ARC app creates item on shelf and spinning animation.
   if (is_pinned()) {
-    EXPECT_EQ(ash::SHELF_ACTION_NEW_WINDOW_CREATED,
-              SelectShelfItem(shelf_id, ui::ET_MOUSE_PRESSED,
-                              display::kInvalidDisplayId));
+    EXPECT_EQ(
+        ash::SHELF_ACTION_NEW_WINDOW_CREATED,
+        SelectShelfItem(shelf_id, ui::ET_MOUSE_PRESSED,
+                        display::kInvalidDisplayId, ash::LAUNCH_FROM_SHELF));
   } else {
     arc::LaunchApp(profile(), app_id, ui::EF_LEFT_MOUSE_BUTTON,
                    arc::UserInteractionType::NOT_USER_INITIATED);

chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

@@ -79,6 +79,7 @@
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
+#include "chrome/services/app_service/public/mojom/types.mojom.h"
 #include "chromeos/strings/grit/chromeos_strings.h"
 #include "components/account_id/account_id.h"
 #include "components/arc/arc_prefs.h"
@@ -139,6 +140,19 @@ const extensions::Extension* GetExtension(Profile* profile,
   return registry->GetInstalledExtension(extension_id);
 }
 
+apps::mojom::LaunchSource ConvertLaunchSource(ash::ShelfLaunchSource source) {
+  switch (source) {
+    case ash::LAUNCH_FROM_UNKNOWN:
+      return apps::mojom::LaunchSource::kUnknown;
+    case ash::LAUNCH_FROM_APP_LIST:
+      return apps::mojom::LaunchSource::kFromAppListGrid;
+    case ash::LAUNCH_FROM_APP_LIST_SEARCH:
+      return apps::mojom::LaunchSource::kFromAppListQuery;
+    case ash::LAUNCH_FROM_SHELF:
+      return apps::mojom::LaunchSource::kFromShelf;
+  }
+}
+
 }  // namespace
 
 // A class to get events from ChromeOS when a user gets changed or added.
@@ -481,8 +495,7 @@ void ChromeLauncherController::LaunchApp(const ash::ShelfID& id,
   apps::AppServiceProxy* proxy =
       apps::AppServiceProxyFactory::GetForProfile(profile_);
   DCHECK(proxy);
-  proxy->Launch(app_id, event_flags, apps::mojom::LaunchSource::kFromShelf,
-                display_id);
+  proxy->Launch(app_id, event_flags, ConvertLaunchSource(source), display_id);
 }
 
 void ChromeLauncherController::ActivateApp(const std::string& app_id,