aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc')
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc b/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc
index bac5f1c1f447..353cec01ec98 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2021-06-09 22:13:55 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2021-08-17 00:15:57 UTC
+++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc
-@@ -22,7 +22,7 @@
+@@ -23,7 +23,7 @@
#include "base/win/registry.h"
#endif
@@ -9,19 +9,19 @@
#include "base/environment.h"
#include "base/nix/xdg_util.h"
#endif
-@@ -238,7 +238,7 @@ base::FilePath GetEndpointVerificationDir() {
- return *GetEndpointVerificationDirOverride();
+@@ -241,7 +241,7 @@ base::FilePath GetEndpointVerificationDir() {
+ bool got_path = false;
#if defined(OS_WIN)
- if (!base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path))
+ got_path = base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path);
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
std::unique_ptr<base::Environment> env(base::Environment::Create());
path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar,
base::nix::kDotConfigDir);
-@@ -249,7 +249,7 @@ base::FilePath GetEndpointVerificationDir() {
- if (true)
- #endif
+@@ -252,7 +252,7 @@ base::FilePath GetEndpointVerificationDir() {
+ if (!got_path)
return path;
+
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
path = path.AppendASCII("google");