Commit 3b059c57 authored by jam's avatar jam Committed by Commit bot

Remove some dead code related to SSLStatus in the renderer

BUG=598073

Review-Url: https://codereview.chromium.org/2153673002
Cr-Commit-Position: refs/heads/master@{#406094}
parent aa0f860b
...@@ -143,7 +143,6 @@ IPC_STRUCT_TRAITS_BEGIN(content::ContextMenuParams) ...@@ -143,7 +143,6 @@ IPC_STRUCT_TRAITS_BEGIN(content::ContextMenuParams)
IPC_STRUCT_TRAITS_MEMBER(writing_direction_left_to_right) IPC_STRUCT_TRAITS_MEMBER(writing_direction_left_to_right)
IPC_STRUCT_TRAITS_MEMBER(writing_direction_right_to_left) IPC_STRUCT_TRAITS_MEMBER(writing_direction_right_to_left)
IPC_STRUCT_TRAITS_MEMBER(edit_flags) IPC_STRUCT_TRAITS_MEMBER(edit_flags)
IPC_STRUCT_TRAITS_MEMBER(security_info)
IPC_STRUCT_TRAITS_MEMBER(frame_charset) IPC_STRUCT_TRAITS_MEMBER(frame_charset)
IPC_STRUCT_TRAITS_MEMBER(referrer_policy) IPC_STRUCT_TRAITS_MEMBER(referrer_policy)
IPC_STRUCT_TRAITS_MEMBER(custom_context) IPC_STRUCT_TRAITS_MEMBER(custom_context)
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include "content/common/content_export.h" #include "content/common/content_export.h"
#include "content/public/common/menu_item.h" #include "content/public/common/menu_item.h"
#include "content/public/common/page_state.h" #include "content/public/common/page_state.h"
#include "content/public/common/ssl_status.h"
#include "third_party/WebKit/public/platform/WebCString.h" #include "third_party/WebKit/public/platform/WebCString.h"
#include "third_party/WebKit/public/platform/WebReferrerPolicy.h" #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
#include "third_party/WebKit/public/web/WebContextMenuData.h" #include "third_party/WebKit/public/web/WebContextMenuData.h"
...@@ -146,9 +145,6 @@ struct CONTENT_EXPORT ContextMenuParams { ...@@ -146,9 +145,6 @@ struct CONTENT_EXPORT ContextMenuParams {
// able to perform the corresponding action. // able to perform the corresponding action.
int edit_flags; int edit_flags;
// The security info for the resource we are showing the menu on.
SSLStatus security_info;
// The character encoding of the frame on which the menu is invoked. // The character encoding of the frame on which the menu is invoked.
std::string frame_charset; std::string frame_charset;
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
#include <stddef.h> #include <stddef.h>
#include "content/common/ssl_status_serialization.h"
#include "content/public/common/context_menu_params.h" #include "content/public/common/context_menu_params.h"
#include "content/public/renderer/content_renderer_client.h" #include "content/public/renderer/content_renderer_client.h"
#include "content/renderer/history_serialization.h" #include "content/renderer/history_serialization.h"
...@@ -63,10 +62,6 @@ ContextMenuParams ContextMenuParamsBuilder::Build( ...@@ -63,10 +62,6 @@ ContextMenuParams ContextMenuParamsBuilder::Build(
params.link_text = data.linkText; params.link_text = data.linkText;
// Deserialize the SSL info.
if (!data.securityInfo.isEmpty())
CHECK(DeserializeSecurityInfo(data.securityInfo, &params.security_info));
return params; return params;
} }
......
...@@ -330,12 +330,6 @@ bool ContextMenuClientImpl::showContextMenu(const ContextMenu* defaultMenu, bool ...@@ -330,12 +330,6 @@ bool ContextMenuClientImpl::showContextMenu(const ContextMenu* defaultMenu, bool
if (selectedFrame->editor().selectionHasStyle(CSSPropertyDirection, "rtl") != FalseTriState) if (selectedFrame->editor().selectionHasStyle(CSSPropertyDirection, "rtl") != FalseTriState)
data.writingDirectionRightToLeft |= WebContextMenuData::CheckableMenuItemChecked; data.writingDirectionRightToLeft |= WebContextMenuData::CheckableMenuItemChecked;
// Now retrieve the security info.
DocumentLoader* dl = selectedFrame->loader().documentLoader();
WebDataSource* ds = WebDataSourceImpl::fromDocumentLoader(dl);
if (ds)
data.securityInfo = ds->response().securityInfo();
data.referrerPolicy = static_cast<WebReferrerPolicy>(selectedFrame->document()->getReferrerPolicy()); data.referrerPolicy = static_cast<WebReferrerPolicy>(selectedFrame->document()->getReferrerPolicy());
// Filter out custom menu elements and add them into the data. // Filter out custom menu elements and add them into the data.
......
...@@ -184,9 +184,6 @@ struct WebContextMenuData { ...@@ -184,9 +184,6 @@ struct WebContextMenuData {
// Which edit operations are available in the context. // Which edit operations are available in the context.
int editFlags; int editFlags;
// Security information for the context.
WebCString securityInfo;
// The referrer policy applicable to this context. // The referrer policy applicable to this context.
WebReferrerPolicy referrerPolicy; WebReferrerPolicy referrerPolicy;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment