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

Side by Side Diff: chrome/renderer/safe_browsing/phishing_classifier_delegate.cc

Issue 8573018: Convert to base::Callback in safe_browsing client-side-detection code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Don't call Run() on null callbacks. Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h" 5 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/bind.h"
9 #include "base/callback.h" 10 #include "base/callback.h"
10 #include "base/lazy_instance.h" 11 #include "base/lazy_instance.h"
11 #include "base/logging.h" 12 #include "base/logging.h"
12 #include "base/metrics/histogram.h" 13 #include "base/metrics/histogram.h"
13 #include "base/memory/scoped_callback_factory.h" 14 #include "base/memory/scoped_callback_factory.h"
14 #include "chrome/common/safe_browsing/csd.pb.h" 15 #include "chrome/common/safe_browsing/csd.pb.h"
15 #include "chrome/common/safe_browsing/safebrowsing_messages.h" 16 #include "chrome/common/safe_browsing/safebrowsing_messages.h"
16 #include "chrome/renderer/safe_browsing/feature_extractor_clock.h" 17 #include "chrome/renderer/safe_browsing/feature_extractor_clock.h"
17 #include "chrome/renderer/safe_browsing/phishing_classifier.h" 18 #include "chrome/renderer/safe_browsing/phishing_classifier.h"
18 #include "chrome/renderer/safe_browsing/scorer.h" 19 #include "chrome/renderer/safe_browsing/scorer.h"
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 // Keep classifier_page_text_, in case the browser notifies us later that 279 // Keep classifier_page_text_, in case the browser notifies us later that
279 // we should classify the URL. 280 // we should classify the URL.
280 return; 281 return;
281 } 282 }
282 283
283 VLOG(2) << "Starting classification for " << last_finished_load_url_; 284 VLOG(2) << "Starting classification for " << last_finished_load_url_;
284 last_url_sent_to_classifier_ = last_finished_load_url_; 285 last_url_sent_to_classifier_ = last_finished_load_url_;
285 is_classifying_ = true; 286 is_classifying_ = true;
286 classifier_->BeginClassification( 287 classifier_->BeginClassification(
287 &classifier_page_text_, 288 &classifier_page_text_,
288 NewCallback(this, &PhishingClassifierDelegate::ClassificationDone)); 289 base::Bind(&PhishingClassifierDelegate::ClassificationDone,
290 base::Unretained(this)));
289 } 291 }
290 292
291 } // namespace safe_browsing 293 } // namespace safe_browsing
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698