Changeset View
Changeset View
Standalone View
Standalone View
www/chromium/files/patch-net_base_network__change__notifier.cc
| --- net/base/network_change_notifier.cc.orig 2020-02-03 21:52:49 UTC | --- net/base/network_change_notifier.cc.orig 2020-08-10 18:39:31 UTC | ||||
| +++ net/base/network_change_notifier.cc | +++ net/base/network_change_notifier.cc | ||||
| @@ -35,7 +35,7 @@ | @@ -35,7 +35,7 @@ | ||||
| #include "net/base/network_change_notifier_linux.h" | #include "net/base/network_change_notifier_linux.h" | ||||
| #elif defined(OS_MACOSX) | #elif defined(OS_MACOSX) | ||||
| #include "net/base/network_change_notifier_mac.h" | #include "net/base/network_change_notifier_mac.h" | ||||
| -#elif defined(OS_CHROMEOS) || defined(OS_ANDROID) | -#elif defined(OS_CHROMEOS) || defined(OS_ANDROID) | ||||
| +#elif defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) | +#elif defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) | ||||
| #include "net/base/network_change_notifier_posix.h" | #include "net/base/network_change_notifier_posix.h" | ||||
| #elif defined(OS_FUCHSIA) | #elif defined(OS_FUCHSIA) | ||||
| #include "net/base/network_change_notifier_fuchsia.h" | #include "net/base/network_change_notifier_fuchsia.h" | ||||
| @@ -229,7 +229,7 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo | @@ -240,8 +240,11 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo | ||||
| // service in a separate process. | #elif defined(OS_FUCHSIA) | ||||
| return std::make_unique<NetworkChangeNotifierPosix>(initial_type, | |||||
| initial_subtype); | |||||
| -#elif defined(OS_CHROMEOS) | |||||
| +#elif defined(OS_CHROMEOS) || defined(OS_BSD) | |||||
| return std::make_unique<NetworkChangeNotifierPosix>(initial_type, | |||||
| initial_subtype); | |||||
| #elif defined(OS_LINUX) | |||||
| @@ -241,7 +241,6 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo | |||||
| return std::make_unique<NetworkChangeNotifierFuchsia>( | return std::make_unique<NetworkChangeNotifierFuchsia>( | ||||
| 0 /* required_features */); | 0 /* required_features */); | ||||
| +#elif defined(OS_BSD) | |||||
| + return std::make_unique<MockNetworkChangeNotifier>( | |||||
| + std::make_unique<SystemDnsConfigChangeNotifier>( | |||||
| + nullptr /* task_runner */, nullptr /* dns_config_service */)); | |||||
| #else | #else | ||||
| - NOTIMPLEMENTED(); | - NOTIMPLEMENTED(); | ||||
| return NULL; | return NULL; | ||||
| #endif | #endif | ||||
| } | } | ||||