1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-11-03 10:09:45 UTC
+++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
@@ -464,7 +464,7 @@ std::string GetFileExtension(FileExtension file_extens
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_BSD)
SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) {
SiteConfig config;
bool is_app_found = false;
@@ -1936,7 +1936,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc
if (app_name.empty()) {
app_name = GetSiteConfiguration(site).app_name;
}
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
ASSERT_TRUE(override_registration_->test_override->IsShortcutCreated(
profile(), app_id, app_name));
ASSERT_TRUE(
@@ -3253,7 +3253,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna
app_state->id, app_state->name);
ASSERT_TRUE(icon_color.has_value());
ASSERT_THAT(site_config.icon_color, testing::Eq(icon_color.value()));
-#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
ASSERT_TRUE(override_registration_->test_override->IsRunOnOsLoginEnabled(
profile(), app_state->id, app_state->name));
#endif
@@ -3268,7 +3268,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site);
ASSERT_TRUE(app_state);
base::ScopedAllowBlockingForTesting allow_blocking;
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
ASSERT_FALSE(override_registration_->test_override->IsRunOnOsLoginEnabled(
profile(), app_state->id, app_state->name));
#endif
@@ -3278,7 +3278,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
void WebAppIntegrationTestDriver::CheckSiteHandlesFile(
Site site,
FileExtension file_extension) {
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (!BeforeStateCheckAction(__FUNCTION__)) {
return;
}
@@ -3294,7 +3294,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile
void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile(
Site site,
FileExtension file_extension) {
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (!BeforeStateCheckAction(__FUNCTION__)) {
return;
}
@@ -4079,7 +4079,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu
base::FilePath shortcut_dir,
const std::string& app_name,
const webapps::AppId& app_id) {
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
return override_registration_->test_override->GetShortcutPath(
profile(), shortcut_dir, app_id, app_name);
#else
@@ -4273,7 +4273,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre
const webapps::AppId& id) {
base::ScopedAllowBlockingForTesting allow_blocking;
bool is_shortcut_and_icon_correct = false;
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
bool is_shortcut_correct =
override_registration_->test_override->IsShortcutCreated(profile, id,
name);
@@ -4317,7 +4317,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr
do_icon_colors_match =
(expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value());
}
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
SkColor expected_icon_pixel_color =
GetSiteConfigurationFromAppName(name).icon_color;
absl::optional<SkColor> actual_color_install_icon_size =
|
