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

Side by Side Diff: chrome/browser/safe_browsing/client_side_detection_host.cc

Issue 556703004: Remove page id from FrameNavigateParams. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleaner Created 6 years, 3 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
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 #include "chrome/browser/safe_browsing/client_side_detection_host.h" 5 #include "chrome/browser/safe_browsing/client_side_detection_host.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 // Store redirect chain information. 387 // Store redirect chain information.
388 if (params.url.host() != cur_host_) { 388 if (params.url.host() != cur_host_) {
389 cur_host_ = params.url.host(); 389 cur_host_ = params.url.host();
390 cur_host_redirects_ = params.redirects; 390 cur_host_redirects_ = params.redirects;
391 } 391 }
392 browse_info_->url = params.url; 392 browse_info_->url = params.url;
393 browse_info_->host_redirects = cur_host_redirects_; 393 browse_info_->host_redirects = cur_host_redirects_;
394 browse_info_->url_redirects = params.redirects; 394 browse_info_->url_redirects = params.redirects;
395 browse_info_->referrer = params.referrer.url; 395 browse_info_->referrer = params.referrer.url;
396 browse_info_->http_status_code = details.http_status_code; 396 browse_info_->http_status_code = details.http_status_code;
397 browse_info_->page_id = params.page_id; 397 browse_info_->page_id = details.entry->GetPageID();
398 398
399 should_extract_malware_features_ = true; 399 should_extract_malware_features_ = true;
400 should_classify_for_malware_ = false; 400 should_classify_for_malware_ = false;
401 pageload_complete_ = false; 401 pageload_complete_ = false;
402 402
403 // Check whether we can cassify the current URL for phishing or malware. 403 // Check whether we can cassify the current URL for phishing or malware.
404 classification_request_ = new ShouldClassifyUrlRequest( 404 classification_request_ = new ShouldClassifyUrlRequest(
405 params, 405 params,
406 base::Bind(&ClientSideDetectionHost::OnPhishingPreClassificationDone, 406 base::Bind(&ClientSideDetectionHost::OnPhishingPreClassificationDone,
407 weak_factory_.GetWeakPtr()), 407 weak_factory_.GetWeakPtr()),
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 ui_manager_->RemoveObserver(this); 737 ui_manager_->RemoveObserver(this);
738 738
739 ui_manager_ = ui_manager; 739 ui_manager_ = ui_manager;
740 if (ui_manager) 740 if (ui_manager)
741 ui_manager_->AddObserver(this); 741 ui_manager_->AddObserver(this);
742 742
743 database_manager_ = database_manager; 743 database_manager_ = database_manager;
744 } 744 }
745 745
746 } // namespace safe_browsing 746 } // namespace safe_browsing
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698