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

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

Issue 105493002: Use base namespace for string16 in chrome/renderer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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) 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/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 DocumentState* document_state = DocumentState::FromDataSource( 154 DocumentState* document_state = DocumentState::FromDataSource(
155 frame->dataSource()); 155 frame->dataSource());
156 NavigationState* navigation_state = document_state->navigation_state(); 156 NavigationState* navigation_state = document_state->navigation_state();
157 CancelPendingClassification(navigation_state->was_within_same_page() ? 157 CancelPendingClassification(navigation_state->was_within_same_page() ?
158 NAVIGATE_WITHIN_PAGE : NAVIGATE_AWAY); 158 NAVIGATE_WITHIN_PAGE : NAVIGATE_AWAY);
159 if (frame == render_view()->GetWebView()->mainFrame()) { 159 if (frame == render_view()->GetWebView()->mainFrame()) {
160 last_main_frame_transition_ = navigation_state->transition_type(); 160 last_main_frame_transition_ = navigation_state->transition_type();
161 } 161 }
162 } 162 }
163 163
164 void PhishingClassifierDelegate::PageCaptured(string16* page_text, 164 void PhishingClassifierDelegate::PageCaptured(base::string16* page_text,
165 bool preliminary_capture) { 165 bool preliminary_capture) {
166 if (preliminary_capture) { 166 if (preliminary_capture) {
167 return; 167 return;
168 } 168 }
169 // Make sure there's no classification in progress. We don't want to swap 169 // Make sure there's no classification in progress. We don't want to swap
170 // out the page text string from underneath the term feature extractor. 170 // out the page text string from underneath the term feature extractor.
171 // 171 //
172 // Note: Currently, if the url hasn't changed, we won't restart 172 // Note: Currently, if the url hasn't changed, we won't restart
173 // classification in this case. We may want to adjust this. 173 // classification in this case. We may want to adjust this.
174 CancelPendingClassification(PAGE_RECAPTURED); 174 CancelPendingClassification(PAGE_RECAPTURED);
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 VLOG(2) << "Starting classification for " << last_finished_load_url_; 283 VLOG(2) << "Starting classification for " << last_finished_load_url_;
284 last_url_sent_to_classifier_ = last_finished_load_url_; 284 last_url_sent_to_classifier_ = last_finished_load_url_;
285 is_classifying_ = true; 285 is_classifying_ = true;
286 classifier_->BeginClassification( 286 classifier_->BeginClassification(
287 &classifier_page_text_, 287 &classifier_page_text_,
288 base::Bind(&PhishingClassifierDelegate::ClassificationDone, 288 base::Bind(&PhishingClassifierDelegate::ClassificationDone,
289 base::Unretained(this))); 289 base::Unretained(this)));
290 } 290 }
291 291
292 } // namespace safe_browsing 292 } // namespace safe_browsing
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698