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

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

Issue 16398002: Revert 203400 "Add a killswitch for CSD malware IP match and rep..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
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 CSD malware IP matching kill switch is turned on.
176 virtual bool MalwareKillSwitchOn();
177
178 // Called on the IO thread to cancel a pending check if the result is no 175 // Called on the IO thread to cancel a pending check if the result is no
179 // longer needed. 176 // longer needed.
180 void CancelCheck(Client* client); 177 void CancelCheck(Client* client);
181 178
182 // Called on the IO thread when the SafeBrowsingProtocolManager has received 179 // Called on the IO thread when the SafeBrowsingProtocolManager has received
183 // the full hash results for prefix hits detected in the database. 180 // the full hash results for prefix hits detected in the database.
184 void HandleGetHashResults( 181 void HandleGetHashResults(
185 SafeBrowsingCheck* check, 182 SafeBrowsingCheck* check,
186 const std::vector<SBFullHashResult>& full_hashes, 183 const std::vector<SBFullHashResult>& full_hashes,
187 bool can_cache); 184 bool can_cache);
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 398
402 std::deque<QueuedCheck> queued_checks_; 399 std::deque<QueuedCheck> queued_checks_;
403 400
404 // Timeout to use for safe browsing checks. 401 // Timeout to use for safe browsing checks.
405 base::TimeDelta check_timeout_; 402 base::TimeDelta check_timeout_;
406 403
407 DISALLOW_COPY_AND_ASSIGN(SafeBrowsingDatabaseManager); 404 DISALLOW_COPY_AND_ASSIGN(SafeBrowsingDatabaseManager);
408 }; 405 };
409 406
410 #endif // CHROME_BROWSER_SAFE_BROWSING_DATABASE_MANAGER_H_ 407 #endif // CHROME_BROWSER_SAFE_BROWSING_DATABASE_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698