aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-components_security__interstitials_content_utils.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-components_security__interstitials_content_utils.cc')
-rw-r--r--www/chromium/files/patch-components_security__interstitials_content_utils.cc27
1 files changed, 4 insertions, 23 deletions
diff --git a/www/chromium/files/patch-components_security__interstitials_content_utils.cc b/www/chromium/files/patch-components_security__interstitials_content_utils.cc
index 01dbabc11844..d6411a65d266 100644
--- a/www/chromium/files/patch-components_security__interstitials_content_utils.cc
+++ b/www/chromium/files/patch-components_security__interstitials_content_utils.cc
@@ -1,30 +1,11 @@
---- components/security_interstitials/content/utils.cc.orig 2020-05-15 15:04:01 UTC
+--- components/security_interstitials/content/utils.cc.orig 2020-11-13 06:36:41 UTC
+++ components/security_interstitials/content/utils.cc
-@@ -31,12 +31,18 @@ void LaunchDateAndTimeSettings() {
+@@ -31,7 +31,7 @@ void LaunchDateAndTimeSettings() {
#if defined(OS_ANDROID)
JNIEnv* env = base::android::AttachCurrentThread();
Java_DateAndTimeSettingsHelper_openDateAndTimeSettings(env);
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
struct ClockCommand {
const char* const pathname;
const char* const argument;
- };
- static const ClockCommand kClockCommands[] = {
-+#if defined(OS_BSD)
-+ // GNOME
-+ {"/usr/local/bin/gnome-control-center", "datetime"},
-+ // KDE
-+ {"/usr/local/bin/kcmshell4", "clock"},
-+#else
- // Unity
- {"/usr/bin/unity-control-center", "datetime"},
- // GNOME
-@@ -50,6 +56,7 @@ void LaunchDateAndTimeSettings() {
- {"/usr/bin/kcmshell4", "clock"},
- {"/usr/local/bin/kcmshell4", "clock"},
- {"/opt/bin/kcmshell4", "clock"},
-+#endif
- };
-
- base::CommandLine command(base::FilePath(""));