content/browser/renderer_host/render_sandbox_host_linux.cc - Issue 8602002: Move some webkit_glue embedder functions into WebKitPlatformSupport virtual methods

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/render_sandbox_host_linux.cc

Issue 8602002: Move some webkit_glue embedder functions into WebKitPlatformSupport virtual methods (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: style Created 9 years, 1 month 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

« chrome/browser/idbbindingutilities_browsertest.cc ('K') | « content/browser/in_process_webkit/browser_webkitplatformsupport_impl.h ('k') | content/common/content_webkitplatformsupport_impl.h » ('j') | content/common/content_webkitplatformsupport_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_sandbox_host_linux.cc

diff --git a/content/browser/renderer_host/render_sandbox_host_linux.cc b/content/browser/renderer_host/render_sandbox_host_linux.cc

index 0ce5d884229326b01ed6830ccd99c0187ef0f2f7..c1c98f73caed705a9511058c4bac5a425f266b81 100644

--- a/content/browser/renderer_host/render_sandbox_host_linux.cc

+++ b/content/browser/renderer_host/render_sandbox_host_linux.cc

@@ -26,6 +26,7 @@

#include "base/shared_memory.h"

#include "base/string_number_conversions.h"

#include "base/string_util.h"

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

#include "content/common/font_config_ipc_linux.h"

#include "content/common/sandbox_methods_linux.h"

#include "content/common/unix_domain_socket_posix.h"

@@ -33,7 +34,6 @@

#include "third_party/npapi/bindings/npapi_extensions.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebFontInfo.h"

-#include "webkit/glue/webkitplatformsupport_impl.h"

using WebKit::WebCString;

using WebKit::WebFontInfo;

@@ -645,7 +645,7 @@ class SandboxIPCProcess {

const int browser_socket_;

FontConfigDirect* const font_config_;

std::vector<std::string> sandbox_cmd_;

- scoped_ptr<webkit_glue::WebKitPlatformSupportImpl> webkit_platform_support_;

+ scoped_ptr<ContentWebKitPlatformSupportImpl> webkit_platform_support_;

};

SandboxIPCProcess::~SandboxIPCProcess() {

@@ -656,7 +656,7 @@ SandboxIPCProcess::~SandboxIPCProcess() {

void SandboxIPCProcess::EnsureWebKitInitialized() {

if (webkit_platform_support_.get())

return;

- webkit_platform_support_.reset(new webkit_glue::WebKitPlatformSupportImpl);

+ webkit_platform_support_.reset(new ContentWebKitPlatformSupportImpl);

WebKit::initialize(webkit_platform_support_.get());

}