diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc b/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc index 180cd5f069e9..c5c6ffa72642 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig 2023-08-17 07:33:31 UTC +--- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig 2023-09-13 12:11:42 UTC +++ chrome/browser/web_applications/test/os_integration_test_override_impl.cc @@ -127,7 +127,7 @@ std::vector<std::wstring> GetFileExtensionsForProgId( } @@ -18,16 +18,7 @@ base::FilePath desktop_shortcut_path = GetShortcutPath(profile, desktop(), app_id, app_name); LOG(INFO) << desktop_shortcut_path; -@@ -241,7 +241,7 @@ bool OsIntegrationTestOverrideImpl::ForceDeleteAllShor - return DeleteDesktopDirOnWin() && DeleteApplicationMenuDirOnWin(); - #elif BUILDFLAG(IS_MAC) - return DeleteChromeAppsDir(); --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return DeleteDesktopDirOnLinux(); - #else - NOTREACHED() << "Not implemented on ChromeOS/Fuchsia "; -@@ -277,7 +277,7 @@ bool OsIntegrationTestOverrideImpl::DeleteApplicationM +@@ -264,7 +264,7 @@ bool OsIntegrationTestOverrideImpl::DeleteApplicationM } #endif // BUILDFLAG(IS_WIN) @@ -36,7 +27,7 @@ bool OsIntegrationTestOverrideImpl::DeleteDesktopDirOnLinux() { if (desktop_.IsValid()) { return desktop_.Delete(); -@@ -291,7 +291,7 @@ bool OsIntegrationTestOverrideImpl::IsRunOnOsLoginEnab +@@ -278,7 +278,7 @@ bool OsIntegrationTestOverrideImpl::IsRunOnOsLoginEnab Profile* profile, const AppId& app_id, const std::string& app_name) { @@ -45,7 +36,7 @@ std::string shortcut_filename = "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop"; return base::PathExists(startup().Append(shortcut_filename)); -@@ -347,7 +347,7 @@ bool OsIntegrationTestOverrideImpl::IsFileExtensionHan +@@ -334,7 +334,7 @@ bool OsIntegrationTestOverrideImpl::IsFileExtensionHan is_file_handled = shell_integration::CanApplicationHandleURL(app_path, test_file_url); base::DeleteFile(test_file_path); @@ -54,7 +45,7 @@ base::FilePath user_applications_dir = applications_dir().Append("applications"); bool database_update_called = false; -@@ -391,7 +391,7 @@ OsIntegrationTestOverrideImpl::GetShortcutIconTopLeftC +@@ -378,7 +378,7 @@ OsIntegrationTestOverrideImpl::GetShortcutIconTopLeftC return absl::nullopt; } return GetIconTopLeftColorFromShortcutFile(shortcut_path); @@ -63,7 +54,7 @@ WebAppProvider* provider = WebAppProvider::GetForLocalAppsUnchecked(profile); if (!provider) { return absl::nullopt; -@@ -441,7 +441,7 @@ base::FilePath OsIntegrationTestOverrideImpl::GetShort +@@ -428,7 +428,7 @@ base::FilePath OsIntegrationTestOverrideImpl::GetShort app_installed_profiles.end()) { return shortcut_path; } @@ -72,7 +63,7 @@ std::string shortcut_filename = "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop"; base::FilePath shortcut_path = shortcut_dir.Append(shortcut_filename); -@@ -467,7 +467,7 @@ bool OsIntegrationTestOverrideImpl::IsShortcutCreated( +@@ -454,7 +454,7 @@ bool OsIntegrationTestOverrideImpl::IsShortcutCreated( base::FilePath app_shortcut_path = GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name); return base::PathExists(app_shortcut_path); @@ -81,7 +72,7 @@ base::FilePath desktop_shortcut_path = GetShortcutPath(profile, desktop(), app_id, app_name); return base::PathExists(desktop_shortcut_path); -@@ -656,7 +656,7 @@ void OsIntegrationTestOverrideImpl::EnableOrDisablePat +@@ -643,7 +643,7 @@ void OsIntegrationTestOverrideImpl::EnableOrDisablePat } #endif // BUILDFLAG(IS_MAC) @@ -90,7 +81,7 @@ const base::FilePath& OsIntegrationTestOverrideImpl::desktop() { return desktop_.GetPath(); } -@@ -691,7 +691,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri +@@ -678,7 +678,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri #elif BUILDFLAG(IS_MAC) bool success = chrome_apps_folder_.CreateUniqueTempDirUnderPath(base_path); CHECK(success); @@ -99,7 +90,7 @@ bool success = desktop_.CreateUniqueTempDirUnderPath(base_path); CHECK(success); success = startup_.CreateUniqueTempDirUnderPath(base_path); -@@ -712,7 +712,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri +@@ -699,7 +699,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri #elif BUILDFLAG(IS_MAC) bool success = chrome_apps_folder_.CreateUniqueTempDir(); CHECK(success); @@ -108,7 +99,7 @@ bool success = desktop_.CreateUniqueTempDir(); CHECK(success); success = startup_.CreateUniqueTempDir(); -@@ -722,7 +722,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri +@@ -709,7 +709,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri #endif } @@ -117,7 +108,7 @@ auto callback = base::BindRepeating([](base::FilePath filename_in, std::string xdg_command, std::string file_contents) { -@@ -769,7 +769,7 @@ OsIntegrationTestOverrideImpl::~OsIntegrationTestOverr +@@ -756,7 +756,7 @@ OsIntegrationTestOverrideImpl::~OsIntegrationTestOverr } } } |