[Default Apps] Add App IDs of Android Apps and set default app order.

This CL apps the app IDs of Android default apps and their default
app order.

Bug: 1013730
Change-Id: I37ce1aa1633e6a1f4be27a4de2514d2c64a8a0e0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1909667Reviewed-by: Yury Khmel <khmel@chromium.org>
Commit-Queue: Jeevan Shikaram <jshikaram@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714781}

chrome/browser/chromeos/extensions/default_app_order.cc

@@ -43,13 +43,16 @@ const char* const kDefaultAppOrder[] = {
     arc::kPlayStoreAppId,
     extension_misc::kFilesManagerAppId,
     extension_misc::kGmailAppId,
+    arc::kGmailAppId,
     extension_misc::kGoogleDocAppId,
     extension_misc::kGoogleSlidesAppId,
     extension_misc::kGoogleSheetsAppId,
     extension_misc::kDriveHostedAppId,
     extension_misc::kGoogleKeepAppId,
     extension_misc::kCalendarAppId,
+    arc::kGoogleCalendarAppId,
     extension_misc::kYoutubeAppId,
+    arc::kYoutubeAppId,
     arc::kPlayMoviesAppId,                   // Play Movies & TV ARC app
     extension_misc::kGooglePlayMoviesAppId,  // Play Movies & TV Chrome app
     arc::kPlayMusicAppId,                    // Play Music ARC app
@@ -60,11 +63,13 @@ const char* const kDefaultAppOrder[] = {
     ash::kInternalAppIdCamera,
     extension_misc::kCameraAppId,
     extension_misc::kGooglePhotosAppId,
-    arc::kGoogleDuo,
+    arc::kGooglePhotosAppId,
+    arc::kGoogleDuoAppId,
     app_list::kDefaultPageBreak1,  // First default page break
     // TODO(crbug.com/976578): Remove after M78.
     extension_misc::kGoogleMapsAppId,
     default_web_apps::kGoogleMapsAppId,
+    arc::kGoogleMapsAppId,
     ash::kInternalAppIdSettings,
     default_web_apps::kSettingsAppId,
     default_web_apps::kOsSettingsAppId,
@@ -76,8 +81,8 @@ const char* const kDefaultAppOrder[] = {
     default_web_apps::kYoutubeTVAppId,
     default_web_apps::kGoogleNewsAppId,
     extensions::kWebStoreAppId,
-    arc::kLightRoom,
-    arc::kInfinitePainter,
+    arc::kLightRoomAppId,
+    arc::kInfinitePainterAppId,
     default_web_apps::kShowtimeAppId,
     extension_misc::kGooglePlusAppId,
     extension_misc::kChromeRemoteDesktopAppId,

chrome/browser/ui/app_list/arc/arc_app_utils.cc

@@ -208,24 +208,33 @@ int64_t GetValidDisplayId(int64_t display_id) {
 
 }  // namespace
 
+// Package names, kept in sorted order.
+const char kInitialStartParam[] = "S.org.chromium.arc.start_type=initialStart";
+const char kPlayStoreActivity[] = "com.android.vending.AssetBrowserActivity";
+const char kPlayStorePackage[] = "com.android.vending";
+const char kSettingsAppDomainUrlActivity[] =
+    "com.android.settings.Settings$ManageDomainUrlsActivity";
+
+constexpr char kSettingsAppPackage[] = "com.android.settings";
+
+// App IDs, kept in sorted order.
 const char kCameraAppId[] = "goamfaniemdfcajgcmmflhchgkmbngka";
 const char kCameraMigrationAppId[] = "ngmkobaiicipbagcngcmilfkhejlnfci";
-const char kGoogleDuo[] = "djkcbcmkefiiphjkonbeknmcgiheajce";
-const char kInfinitePainter[] = "afihfgfghkmdmggakhkgnfhlikhdpima";
-const char kLightRoom[] = "fpegfnbgomakooccabncdaelhfppceni";
-const char kPlayStoreAppId[] = "cnbgggchhmkkdmeppjobngjoejnihlei";
+const char kGmailAppId[] = "hhkfkjpmacfncmbapfohfocpjpdnobjg";
+const char kGoogleCalendarAppId[] = "decaoeahkmjpajbmlbpogjjkjbjokeed";
+const char kGoogleDuoAppId[] = "djkcbcmkefiiphjkonbeknmcgiheajce";
+const char kGoogleMapsAppId[] = "gmhipfhgnoelkiiofcnimehjnpaejiel";
+const char kGooglePhotosAppId[] = "fdbkkojdbojonckghlanfaopfakedeca";
+const char kInfinitePainterAppId[] = "afihfgfghkmdmggakhkgnfhlikhdpima";
+const char kLegacyCameraAppId[] = "obfofkigjfamlldmipdegnjlcpincibc";
+const char kLightRoomAppId[] = "fpegfnbgomakooccabncdaelhfppceni";
 const char kPlayBooksAppId[] = "cafegjnmmjpfibnlddppihpnkbkgicbg";
 const char kPlayGamesAppId[] = "nplnnjkbeijcggmpdcecpabgbjgeiedc";
-const char kLegacyCameraAppId[] = "obfofkigjfamlldmipdegnjlcpincibc";
 const char kPlayMoviesAppId[] = "dbbihmicnlldbflflckpafphlekmjfnm";
 const char kPlayMusicAppId[] = "ophbaopahelaolbjliokocojjbgfadfn";
-const char kPlayStorePackage[] = "com.android.vending";
-const char kPlayStoreActivity[] = "com.android.vending.AssetBrowserActivity";
+const char kPlayStoreAppId[] = "cnbgggchhmkkdmeppjobngjoejnihlei";
 const char kSettingsAppId[] = "mconboelelhjpkbdhhiijkgcimoangdj";
-const char kInitialStartParam[] = "S.org.chromium.arc.start_type=initialStart";
-constexpr char kSettingsAppPackage[] = "com.android.settings";
-const char kSettingsAppDomainUrlActivity[] =
-    "com.android.settings.Settings$ManageDomainUrlsActivity";
+const char kYoutubeAppId[] = "aniolghapcdkoolpkffememnhpphmjkl";
 
 bool ShouldShowInLauncher(const std::string& app_id) {
   for (auto* const id : kAppIdsHiddenInLauncher) {

chrome/browser/ui/app_list/arc/arc_app_utils.h

@@ -25,22 +25,28 @@ class BrowserContext;
 
 namespace arc {
 
+extern const char kInitialStartParam[];
+extern const char kPlayStoreActivity[];
+extern const char kPlayStorePackage[];
+extern const char kSettingsAppDomainUrlActivity[];
+
 extern const char kCameraAppId[];
 extern const char kCameraMigrationAppId[];
-extern const char kGoogleDuo[];
-extern const char kInfinitePainter[];
+extern const char kGmailAppId[];
+extern const char kGoogleCalendarAppId[];
+extern const char kGoogleDuoAppId[];
+extern const char kGoogleMapsAppId[];
+extern const char kGooglePhotosAppId[];
+extern const char kInfinitePainterAppId[];
 extern const char kLegacyCameraAppId[];
-extern const char kLightRoom[];
-extern const char kPlayStoreAppId[];
+extern const char kLightRoomAppId[];
 extern const char kPlayBooksAppId[];
 extern const char kPlayGamesAppId[];
 extern const char kPlayMoviesAppId[];
 extern const char kPlayMusicAppId[];
-extern const char kPlayStorePackage[];
-extern const char kPlayStoreActivity[];
+extern const char kPlayStoreAppId[];
 extern const char kSettingsAppId[];
-extern const char kInitialStartParam[];
-extern const char kSettingsAppDomainUrlActivity[];
+extern const char kYoutubeAppId[];
 
 // Represents unparsed intent.
 class Intent {