blob: 09d20182d1b73d327ac34f4683d6738f150059fd (
plain) (
blame)
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
|
--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2021-05-12 22:05:57 UTC
+++ net/proxy_resolution/proxy_config_service_linux.cc
@@ -6,7 +6,9 @@
#include <errno.h>
#include <limits.h>
+#if !defined(OS_BSD)
#include <sys/inotify.h>
+#endif
#include <unistd.h>
#include <map>
@@ -512,6 +514,7 @@ int StringToIntOrDefault(base::StringPiece value, int
return default_value;
}
+#if !defined(OS_BSD)
// This is the KDE version that reads kioslaverc and simulates gsettings.
// Doing this allows the main Delegate code, as well as the unit tests
// for it, to stay the same - and the settings map fairly well besides.
@@ -1002,6 +1005,7 @@ class SettingGetterImplKDE : public ProxyConfigService
DISALLOW_COPY_AND_ASSIGN(SettingGetterImplKDE);
};
+#endif
} // namespace
@@ -1216,8 +1220,10 @@ ProxyConfigServiceLinux::Delegate::Delegate(
case base::nix::DESKTOP_ENVIRONMENT_KDE3:
case base::nix::DESKTOP_ENVIRONMENT_KDE4:
case base::nix::DESKTOP_ENVIRONMENT_KDE5:
+#if !defined(OS_BSD)
setting_getter_.reset(new SettingGetterImplKDE(env_var_getter_.get()));
break;
+#endif
case base::nix::DESKTOP_ENVIRONMENT_XFCE:
case base::nix::DESKTOP_ENVIRONMENT_OTHER:
break;
|
