chrome/browser/safe_browsing/browser_feature_extractor.cc - Issue 8983010: Convert WebContents to return a content::NavigationController instead of the implementation. Upda...

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/browser/safe_browsing/browser_feature_extractor.cc

Issue 8983010: Convert WebContents to return a content::NavigationController instead of the implementation. Upda... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix mac Created 8 years, 12 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/repost_form_warning_controller.cc ('k') | chrome/browser/safe_browsing/client_side_detection_host.cc » ('j') | content/browser/tab_contents/navigation_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/browser_feature_extractor.cc

===================================================================

--- chrome/browser/safe_browsing/browser_feature_extractor.cc (revision 116232)

+++ chrome/browser/safe_browsing/browser_feature_extractor.cc (working copy)

@@ -21,8 +21,8 @@

#include "chrome/browser/safe_browsing/browser_features.h"

#include "chrome/browser/safe_browsing/client_side_detection_service.h"

#include "chrome/common/safe_browsing/csd.pb.h"

-#include "content/browser/tab_contents/navigation_controller.h"

#include "content/public/browser/browser_thread.h"

+#include "content/public/browser/navigation_controller.h"

#include "content/public/browser/navigation_entry.h"

#include "content/public/browser/web_contents.h"

#include "content/public/common/page_transition_types.h"

@@ -49,11 +49,12 @@

VLOG(2) << "Browser feature: " << feature->name() << " " << feature->value();

}

-static void AddNavigationFeatures(const std::string& feature_prefix,

- const NavigationController& controller,

- int index,

- const std::vector<GURL>& redirect_chain,

- ClientPhishingRequest* request) {

+static void AddNavigationFeatures(

+ const std::string& feature_prefix,

+ const content::NavigationController& controller,

+ int index,

+ const std::vector<GURL>& redirect_chain,

+ ClientPhishingRequest* request) {

NavigationEntry* entry = controller.GetEntryAtIndex(index);

bool is_secure_referrer = entry->GetReferrer().url.SchemeIsSecure();

if (!is_secure_referrer) {

@@ -155,7 +156,7 @@

}

// Extract features pertaining to this navigation.

- const NavigationController& controller = tab_->GetController();

+ const content::NavigationController& controller = tab_->GetController();

int url_index = -1;

int first_host_index = -1;