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

Unified Diff: content/browser/tab_contents/tab_contents.cc

Issue 9382037: Move ContextMenuParams struct from webkit/glue to content/public/common. The reasons are: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 8 years, 10 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: content/browser/tab_contents/tab_contents.cc
===================================================================
--- content/browser/tab_contents/tab_contents.cc (revision 121660)
+++ content/browser/tab_contents/tab_contents.cc (working copy)
@@ -36,6 +36,7 @@
#include "content/browser/tab_contents/title_updated_details.h"
#include "content/browser/webui/web_ui_impl.h"
#include "content/common/intents_messages.h"
+#include "content/common/ssl_status_serialization.h"
#include "content/common/view_messages.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/content_browser_client.h"
@@ -1485,10 +1486,8 @@
net::CertStatus cert_status = 0;
int security_bits = -1;
int connection_status = 0;
- SSLManager::DeserializeSecurityInfo(security_info,
- &cert_id, &cert_status,
- &security_bits,
- &connection_status);
+ content::DeserializeSecurityInfo(security_info, &cert_id, &cert_status,
+ &security_bits, &connection_status);
LoadFromMemoryCacheDetails details(url, GetRenderProcessHost()->GetID(),
cert_id, cert_status);

Powered by Google App Engine
This is Rietveld 408576698