content/browser/renderer_host/resource_dispatcher_host.cc - Issue 9382037: Move ContextMenuParams struct from webkit/glue to content/public/common. The reasons are:

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/resource_dispatcher_host.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

« no previous file with comments | « content/browser/renderer_host/render_view_host_unittest.cc ('k') | content/browser/ssl/ssl_manager.h » ('j') | content/public/common/context_menu_params.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/resource_dispatcher_host.cc

===================================================================

--- content/browser/renderer_host/resource_dispatcher_host.cc (revision 121660)

+++ content/browser/renderer_host/resource_dispatcher_host.cc (working copy)

@@ -48,6 +48,7 @@

#include "content/browser/ssl/ssl_manager.h"

#include "content/browser/worker_host/worker_service_impl.h"

#include "content/common/resource_messages.h"

+#include "content/common/ssl_status_serialization.h"

#include "content/common/view_messages.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/content_browser_client.h"

@@ -1503,11 +1504,10 @@

int cert_id =

CertStore::GetInstance()->StoreCert(request->ssl_info().cert,

info->child_id());

- response->security_info =

- SSLManager::SerializeSecurityInfo(

- cert_id, request->ssl_info().cert_status,

- request->ssl_info().security_bits,

- request->ssl_info().connection_status);

+ response->security_info = content::SerializeSecurityInfo(

+ cert_id, request->ssl_info().cert_status,

+ request->ssl_info().security_bits,

+ request->ssl_info().connection_status);

} else {

// We should not have any SSL state.

DCHECK(!request->ssl_info().cert_status &&

@@ -1894,8 +1894,8 @@

const net::SSLInfo& ssl_info = request->ssl_info();

if (ssl_info.cert != NULL) {

int cert_id = CertStore::GetInstance()->StoreCert(ssl_info.cert,

- info->child_id());

- security_info = SSLManager::SerializeSecurityInfo(

+ info->child_id());

+ security_info = content::SerializeSecurityInfo(

cert_id, ssl_info.cert_status, ssl_info.security_bits,

ssl_info.connection_status);

}