chrome/renderer/safe_browsing/phishing_dom_feature_extractor.h - Issue 8573018: Convert to base::Callback in safe_browsing client-side-detection code.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/renderer/safe_browsing/phishing_dom_feature_extractor.h

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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc ('k') | chrome/renderer/safe_browsing/phishing_dom_feature_extractor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/safe_browsing/phishing_dom_feature_extractor.h

diff --git a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor.h b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor.h

index 785f6071fe8da7ecb6effafd828c159ca7ecab3d..8d83fb626bef6ddd22471f6436bc76f22bc2f746 100644

--- a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor.h

+++ b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor.h

@@ -13,7 +13,7 @@

#include <string>

#include "base/basictypes.h"

-#include "base/callback_old.h"

+#include "base/callback.h"

#include "base/memory/scoped_ptr.h"

#include "base/task.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"

@@ -36,7 +36,7 @@ class PhishingDOMFeatureExtractor {

public:

// Callback to be run when feature extraction finishes. The callback

// argument is true if extraction was successful, false otherwise.

- typedef Callback1<bool>::Type DoneCallback;

+ typedef base::Callback<void(bool)> DoneCallback;

// Creates a PhishingDOMFeatureExtractor for the specified RenderView.

// The PhishingDOMFeatureExtrator should be destroyed prior to destroying

@@ -54,7 +54,7 @@ class PhishingDOMFeatureExtractor {

// processing. Once feature extraction is complete, |done_callback|

// is run on the current thread. PhishingDOMFeatureExtractor takes

// ownership of the callback.

- void ExtractFeatures(FeatureMap* features, DoneCallback* done_callback);

+ void ExtractFeatures(FeatureMap* features, const DoneCallback& done_callback);

// Cancels any pending feature extraction. The DoneCallback will not be run.

// Must be called if there is a feature extraction in progress when the page

@@ -131,7 +131,7 @@ class PhishingDOMFeatureExtractor {

// The output parameters from the most recent call to ExtractFeatures().

FeatureMap* features_; // The caller keeps ownership of this.

- scoped_ptr<DoneCallback> done_callback_;

+ DoneCallback done_callback_;

// The current (sub-)document that we are processing. May be a null document

// (isNull()) if we are not currently extracting features.