Commit 5dd9332f authored by Maggie Cai's avatar Maggie Cai Committed by Commit Bot

[COIL] Update apps::mojom::AppType::kMacNative to kMacOs.

This CL updates the naming MacNative to MacOs for app service app type
to make the language inclusive.

TBR=xiyuan@chromium.org, sky@chromium.org

Bug: 1097644
Change-Id: I17cf90fb81c4451a6d05f997db205c718f2afabd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2494403Reviewed-by: default avatarMaggie Cai <mxcai@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Reviewed-by: default avatarDominick Ng <dominickn@chromium.org>
Commit-Queue: Maggie Cai <mxcai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820653}
parent 91d428b2
......@@ -45,7 +45,7 @@ apps::PickerEntryType GetPickerEntryType(apps::mojom::AppType app_type) {
case apps::mojom::AppType::kWeb:
picker_entry_type = apps::PickerEntryType::kWeb;
break;
case apps::mojom::AppType::kMacNative:
case apps::mojom::AppType::kMacOs:
picker_entry_type = apps::PickerEntryType::kMacOs;
break;
}
......
......@@ -29,8 +29,8 @@ std::string AppTypeToString(apps::mojom::AppType app_type) {
return "Built in";
case apps::mojom::AppType::kCrostini:
return "Crostini";
case apps::mojom::AppType::kMacNative:
return "Mac native";
case apps::mojom::AppType::kMacOs:
return "Mac OS";
case apps::mojom::AppType::kPluginVm:
return "Plugin VM";
case apps::mojom::AppType::kLacros:
......
......@@ -318,8 +318,8 @@ api::autotest_private::AppType GetAppType(apps::mojom::AppType type) {
return api::autotest_private::AppType::APP_TYPE_WEB;
case apps::mojom::AppType::kUnknown:
return api::autotest_private::AppType::APP_TYPE_NONE;
case apps::mojom::AppType::kMacNative:
return api::autotest_private::AppType::APP_TYPE_MACNATIVE;
case apps::mojom::AppType::kMacOs:
return api::autotest_private::AppType::APP_TYPE_MACOS;
case apps::mojom::AppType::kLacros:
return api::autotest_private::AppType::APP_TYPE_LACROS;
case apps::mojom::AppType::kRemote:
......
......@@ -51,7 +51,7 @@ TaskType GetTaskType(apps::mojom::AppType app_type) {
case apps::mojom::AppType::kCrostini:
case apps::mojom::AppType::kBuiltIn:
case apps::mojom::AppType::kExtension:
case apps::mojom::AppType::kMacNative:
case apps::mojom::AppType::kMacOs:
case apps::mojom::AppType::kPluginVm:
case apps::mojom::AppType::kLacros:
case apps::mojom::AppType::kRemote:
......
......@@ -51,7 +51,7 @@ em::AppInfo::AppType ExtractAppType(const apps::mojom::AppType app_type) {
return em::AppInfo::AppType::AppInfo_AppType_TYPE_WEB;
case apps::mojom::AppType::kBorealis:
return em::AppInfo::AppType::AppInfo_AppType_TYPE_BOREALIS;
case apps::mojom::AppType::kMacNative:
case apps::mojom::AppType::kMacOs:
case apps::mojom::AppType::kLacros:
case apps::mojom::AppType::kRemote:
case apps::mojom::AppType::kUnknown:
......
......@@ -125,7 +125,7 @@ ash::SearchResultType AppServiceAppResult::GetSearchResultType() const {
return ash::REMOTE_APP;
case apps::mojom::AppType::kBorealis:
return ash::BOREALIS_APP;
case apps::mojom::AppType::kMacNative:
case apps::mojom::AppType::kMacOs:
case apps::mojom::AppType::kUnknown:
NOTREACHED();
return ash::SEARCH_RESULT_TYPE_BOUNDARY;
......
......@@ -552,7 +552,7 @@ bool AppServiceShelfContextMenu::ShouldAddPinMenu() {
// Type kUnknown is used for "unregistered" Crostini apps, which do not
// have a .desktop file and can only be closed, not pinned.
return false;
case apps::mojom::AppType::kMacNative:
case apps::mojom::AppType::kMacOs:
case apps::mojom::AppType::kRemote:
case apps::mojom::AppType::kBorealis:
NOTREACHED() << "Type " << app_type_ << " should not appear in shelf.";
......
......@@ -32,7 +32,7 @@ apps::mojom::AppType GetAppType(apps::PickerEntryType picker_entry_type) {
app_type = apps::mojom::AppType::kWeb;
break;
case apps::PickerEntryType::kMacOs:
app_type = apps::mojom::AppType::kMacNative;
app_type = apps::mojom::AppType::kMacOs;
break;
}
return app_type;
......
......@@ -147,7 +147,7 @@ void AppUninstallDialogView::InitializeView(Profile* profile,
switch (app_type) {
case apps::mojom::AppType::kUnknown:
case apps::mojom::AppType::kBuiltIn:
case apps::mojom::AppType::kMacNative:
case apps::mojom::AppType::kMacOs:
case apps::mojom::AppType::kLacros:
case apps::mojom::AppType::kRemote:
case apps::mojom::AppType::kBorealis:
......
......@@ -35,7 +35,7 @@ namespace autotestPrivate {
Crostini,
Extension,
Web,
MacNative,
MacOS,
PluginVm,
Lacros,
Remote,
......
......@@ -92,7 +92,7 @@ enum AppType {
kCrostini, // Linux (via Crostini) app.
kExtension, // Extension-backed app.
kWeb, // Web app.
kMacNative, // Native Mac app.
kMacOs, // Mac OS app.
kPluginVm, // Plugin VM app, see go/pluginvm.
kLacros, // Lacros browser app, see //docs/lacros.md.
kRemote, // Remote app.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment