Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(443)

Side by Side Diff: chrome/browser/safe_browsing/database_manager.h

Issue 836963003: Add the result of the inclusion whitelist to the OffDomainInclusionDetector's analysis. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@#c1_sbDB_ODIsupport
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 // The Safe Browsing service is responsible for downloading anti-phishing and 5 // The Safe Browsing service is responsible for downloading anti-phishing and
6 // anti-malware tables and checking urls against them. 6 // anti-malware tables and checking urls against them.
7 7
8 #ifndef CHROME_BROWSER_SAFE_BROWSING_DATABASE_MANAGER_H_ 8 #ifndef CHROME_BROWSER_SAFE_BROWSING_DATABASE_MANAGER_H_
9 #define CHROME_BROWSER_SAFE_BROWSING_DATABASE_MANAGER_H_ 9 #define CHROME_BROWSER_SAFE_BROWSING_DATABASE_MANAGER_H_
10 10
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 // To make sure we are conservative we will return true if an error occurs. 165 // To make sure we are conservative we will return true if an error occurs.
166 // This method is expected to be called on the IO thread. 166 // This method is expected to be called on the IO thread.
167 virtual bool MatchDownloadWhitelistUrl(const GURL& url); 167 virtual bool MatchDownloadWhitelistUrl(const GURL& url);
168 168
169 // Check if |str| matches any of the full-length hashes from the download 169 // Check if |str| matches any of the full-length hashes from the download
170 // whitelist. Returns true if there was a match and false otherwise. 170 // whitelist. Returns true if there was a match and false otherwise.
171 // To make sure we are conservative we will return true if an error occurs. 171 // To make sure we are conservative we will return true if an error occurs.
172 // This method is expected to be called on the IO thread. 172 // This method is expected to be called on the IO thread.
173 virtual bool MatchDownloadWhitelistString(const std::string& str); 173 virtual bool MatchDownloadWhitelistString(const std::string& str);
174 174
175 // Check if the |url| matches any of the full-length hashes from the off-
176 // domain inclusion whitelist. Returns true if there was a match and false
177 // otherwise. To make sure we are conservative, we will return true if an
178 // error occurs. This method is expected to be called on the IO thread.
grt (UTC plus 2) 2015/01/07 14:35:48 "expected to be called"? what if the unexpected ha
gab 2015/01/07 17:52:00 Done.
179 virtual bool MatchInclusionWhitelistUrl(const GURL& url);
180
175 // Check if the CSD malware IP matching kill switch is turned on. 181 // Check if the CSD malware IP matching kill switch is turned on.
176 virtual bool IsMalwareKillSwitchOn(); 182 virtual bool IsMalwareKillSwitchOn();
177 183
178 // Check if the CSD whitelist kill switch is turned on. 184 // Check if the CSD whitelist kill switch is turned on.
179 virtual bool IsCsdWhitelistKillSwitchOn(); 185 virtual bool IsCsdWhitelistKillSwitchOn();
180 186
181 // Called on the IO thread to cancel a pending check if the result is no 187 // Called on the IO thread to cancel a pending check if the result is no
182 // longer needed. 188 // longer needed.
183 void CancelCheck(Client* client); 189 void CancelCheck(Client* client);
184 190
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 413
408 std::deque<QueuedCheck> queued_checks_; 414 std::deque<QueuedCheck> queued_checks_;
409 415
410 // Timeout to use for safe browsing checks. 416 // Timeout to use for safe browsing checks.
411 base::TimeDelta check_timeout_; 417 base::TimeDelta check_timeout_;
412 418
413 DISALLOW_COPY_AND_ASSIGN(SafeBrowsingDatabaseManager); 419 DISALLOW_COPY_AND_ASSIGN(SafeBrowsingDatabaseManager);
414 }; 420 };
415 421
416 #endif // CHROME_BROWSER_SAFE_BROWSING_DATABASE_MANAGER_H_ 422 #endif // CHROME_BROWSER_SAFE_BROWSING_DATABASE_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698