content/browser/renderer_host/pepper/content_browser_pepper_host_factory.cc - Issue 1307173009: rebased ppapi vpnProvider

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/pepper/content_browser_pepper_host_factory.cc

Issue 1307173009: rebased ppapi vpnProvider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr

Patch Set: fix compile Created 5 years, 3 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/pepper/DEPS ('k') | content/browser/renderer_host/pepper/pepper_vpn_provider_message_filter_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/pepper/content_browser_pepper_host_factory.cc

diff --git a/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.cc b/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.cc

index f52a2016aad8334950f428b08c80336c6ea88d28..f1a2158819a83aa5bdc557989962af08a9f14e84 100644

--- a/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.cc

+++ b/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.cc

@@ -21,6 +21,7 @@

#include "content/browser/renderer_host/pepper/pepper_truetype_font_host.h"

#include "content/browser/renderer_host/pepper/pepper_truetype_font_list_host.h"

#include "content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.h"

+#include "content/browser/renderer_host/pepper/pepper_vpn_provider_message_filter_chromeos.h"

#include "ppapi/host/message_filter_host.h"

#include "ppapi/host/ppapi_host.h"

#include "ppapi/host/resource_host.h"

@@ -154,6 +155,14 @@ scoped_ptr<ResourceHost> ContentBrowserPepperHostFactory::CreateResourceHost(

return scoped_ptr<ResourceHost>(

new PepperTrueTypeFontListHost(host_, instance, resource));

}

+#if defined(OS_CHROMEOS)

+ case PpapiHostMsg_VpnProvider_Create::ID: {

+ scoped_refptr<PepperVpnProviderMessageFilterChromeOS> vpn_provider(

+ new PepperVpnProviderMessageFilterChromeOS(host_, instance));

+ return scoped_ptr<ResourceHost>(new MessageFilterHost(

+ host_->GetPpapiHost(), instance, resource, vpn_provider));

+ }

+#endif

}