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

Unified Diff: chrome/browser/safe_browsing/malware_details.cc

Issue 6713084: Move the rest of the renderer->browser messages that belong in content. Also do a bunch of cleanup: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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
Index: chrome/browser/safe_browsing/malware_details.cc
===================================================================
--- chrome/browser/safe_browsing/malware_details.cc (revision 79188)
+++ chrome/browser/safe_browsing/malware_details.cc (working copy)
@@ -9,8 +9,7 @@
#include "base/lazy_instance.h"
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/safe_browsing/report.pb.h"
-#include "chrome/common/render_messages.h"
-#include "chrome/common/render_messages_params.h"
+#include "chrome/common/safebrowsing_messages.h"
#include "content/browser/browser_thread.h"
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/tab_contents/navigation_entry.h"
@@ -73,7 +72,7 @@
bool MalwareDetails::OnMessageReceived(const IPC::Message& message) {
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(MalwareDetails, message)
- IPC_MESSAGE_HANDLER(ViewHostMsg_MalwareDOMDetails,
+ IPC_MESSAGE_HANDLER(SafeBrowsingHostMsg_MalwareDOMDetails,
OnReceivedMalwareDOMDetails)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
@@ -196,7 +195,7 @@
// When the renderer is done, this is called.
void MalwareDetails::OnReceivedMalwareDOMDetails(
- const ViewHostMsg_MalwareDOMDetails_Params& params) {
+ const std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node>& params) {
// Schedule this in IO thread, so it doesn't conflict with future users
// of our data structures (eg GetSerializedReport).
BrowserThread::PostTask(
@@ -206,13 +205,13 @@
}
void MalwareDetails::AddDOMDetails(
- const ViewHostMsg_MalwareDOMDetails_Params& params) {
+ const std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node>& params) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
// Add the urls from the DOM to |resources_|. The renderer could be
// sending bogus messages, so limit the number of nodes we accept.
- DVLOG(1) << "Nodes from the DOM: " << params.nodes.size();
- for (uint32 i = 0; i < params.nodes.size() && i < kMaxDomNodes; ++i) {
- ViewHostMsg_MalwareDOMDetails_Node node = params.nodes[i];
+ DVLOG(1) << "Nodes from the DOM: " << params.size();
+ for (uint32 i = 0; i < params.size() && i < kMaxDomNodes; ++i) {
+ SafeBrowsingHostMsg_MalwareDOMDetails_Node node = params[i];
DVLOG(1) << node.url << ", " << node.tag_name << ", " << node.parent;
AddUrl(node.url, node.parent, node.tag_name, &(node.children));
}
« no previous file with comments | « chrome/browser/safe_browsing/malware_details.h ('k') | chrome/browser/safe_browsing/malware_details_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698