summaryrefslogtreecommitdiffstats
path: root/chromium/chrome/browser/safe_browsing
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-08-28 15:28:34 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-08-28 13:54:51 +0000
commit2a19c63448c84c1805fb1a585c3651318bb86ca7 (patch)
treeeb17888e8531aa6ee5e85721bd553b832a7e5156 /chromium/chrome/browser/safe_browsing
parentb014812705fc80bff0a5c120dfcef88f349816dc (diff)
BASELINE: Update Chromium to 69.0.3497.70
Change-Id: I2b7b56e4e7a8b26656930def0d4575dc32b900a0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/browser/safe_browsing')
-rw-r--r--chromium/chrome/browser/safe_browsing/BUILD.gn13
1 files changed, 9 insertions, 4 deletions
diff --git a/chromium/chrome/browser/safe_browsing/BUILD.gn b/chromium/chrome/browser/safe_browsing/BUILD.gn
index 144727b401a..215c3edd221 100644
--- a/chromium/chrome/browser/safe_browsing/BUILD.gn
+++ b/chromium/chrome/browser/safe_browsing/BUILD.gn
@@ -16,6 +16,7 @@ static_library("safe_browsing") {
"chrome_cleaner/chrome_cleaner_controller_impl_win.cc",
"chrome_cleaner/chrome_cleaner_controller_impl_win.h",
"chrome_cleaner/chrome_cleaner_controller_win.h",
+ "chrome_cleaner/chrome_cleaner_extensions_util_win.h",
"chrome_cleaner/chrome_cleaner_fetcher_win.cc",
"chrome_cleaner/chrome_cleaner_fetcher_win.h",
"chrome_cleaner/chrome_cleaner_navigation_util_win.cc",
@@ -49,6 +50,8 @@ static_library("safe_browsing") {
"//chrome/app:generated_resources",
"//components/chrome_cleaner/public/interfaces",
"//components/safe_browsing/common:interfaces",
+ "//mojo/public/cpp/platform",
+ "//mojo/public/cpp/system",
]
if (enable_extensions) {
@@ -72,6 +75,12 @@ static_library("safe_browsing") {
deps += [ "//components/keep_alive_registry" ]
}
+ if (is_chrome_branded && is_win) {
+ sources += [ "chrome_cleaner/chrome_cleaner_extension_util_win.cc" ]
+ } else {
+ sources += [ "chrome_cleaner/chrome_cleaner_extension_util_win_noop.cc" ]
+ }
+
if (safe_browsing_mode != 0) {
# "Safe Browsing Basic" files used for safe browsing in full mode
# (safe_browsing=1) and mobile (=2)
@@ -84,10 +93,6 @@ static_library("safe_browsing") {
"certificate_reporting_service.h",
"certificate_reporting_service_factory.cc",
"certificate_reporting_service_factory.h",
- "notification_image_reporter.cc",
- "notification_image_reporter.h",
- "ping_manager.cc",
- "ping_manager.h",
"safe_browsing_blocking_page.cc",
"safe_browsing_blocking_page.h",
"safe_browsing_navigation_observer.cc",