summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_common_pref__names.h
diff options
context:
space:
mode:
authorCarlos J. Puga Medina <cpm@FreeBSD.org>2017-01-16 22:48:27 +0000
committerCarlos J. Puga Medina <cpm@FreeBSD.org>2017-01-16 22:48:27 +0000
commit6dbfad2eb0314255340f744ef913b09fd33f8ed3 (patch)
tree2379146fde95ec494ba77d260c6c5d7747a28d42 /www/chromium/files/patch-chrome_common_pref__names.h
parentUpdate to 0.1.9 (diff)
www/chromium: update to 55.0.2883.87
Reviewed by: rene MFH: 2017Q1 Security: https://www.vuxml.org/freebsd/603fe0a1-bb26-11e6-8e5a-3065ec8fd3ec.html
Diffstat (limited to 'www/chromium/files/patch-chrome_common_pref__names.h')
-rw-r--r--www/chromium/files/patch-chrome_common_pref__names.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h
index fd4cd55c63f0..048fc19e40f1 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.h
+++ b/www/chromium/files/patch-chrome_common_pref__names.h
@@ -1,15 +1,15 @@
---- chrome/common/pref_names.h.orig 2016-10-06 04:02:14.000000000 +0300
-+++ chrome/common/pref_names.h 2016-10-14 07:01:22.105649000 +0300
-@@ -315,7 +315,7 @@
+--- chrome/common/pref_names.h.orig 2016-12-01 23:02:09 UTC
++++ chrome/common/pref_names.h
+@@ -312,7 +312,7 @@ extern const char kForceGoogleSafeSearch
+ extern const char kForceYouTubeRestrict[];
+ extern const char kForceSessionSync[];
extern const char kAllowedDomainsForApps[];
- extern const char kLastClearBrowsingDataTime[];
- extern const char kClearBrowsingDataHistoryNoticeShownTimes[];
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
extern const char kUsesSystemTheme[];
#endif
extern const char kCurrentThemePackFilename[];
-@@ -347,7 +347,7 @@
+@@ -345,7 +345,7 @@ extern const char kDefaultBrowserSetting
#if defined(OS_MACOSX)
extern const char kShowUpdatePromotionInfoBar[];
#endif
@@ -18,7 +18,7 @@
extern const char kUseCustomChromeFrame[];
#endif
extern const char kBackShortcutBubbleShownCount[];
-@@ -496,7 +496,7 @@
+@@ -493,7 +493,7 @@ extern const char kAppWindowPlacement[];
extern const char kDownloadDefaultDirectory[];
extern const char kDownloadExtensionsToOpen[];
extern const char kDownloadDirUpgraded[];