content/browser/renderer_host/pepper/content_browser_pepper_host_factory.cc - Issue 23514062: Revert r223494 "Simplify PPB_NetworkMonitor proxy."

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 23514062: Revert r223494 "Simplify PPB_NetworkMonitor proxy." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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/browser_ppapi_host_impl.cc ('k') | content/browser/renderer_host/pepper/pepper_message_filter.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 46e8c13d0bf59f8a963926d932f4f1d38ebaee36..97e31738f00709cbbc20012fbec6064162dafd96 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

@@ -11,7 +11,6 @@

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

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

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

-#include "content/browser/renderer_host/pepper/pepper_network_monitor_host.h"

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

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

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

@@ -199,10 +198,6 @@ scoped_ptr<ResourceHost> ContentBrowserPepperHostFactory::CreateResourceHost(

return scoped_ptr<ResourceHost>();

}

- if (message.type() == PpapiHostMsg_NetworkMonitor_Create::ID) {

- return scoped_ptr<ResourceHost>(

- new PepperNetworkMonitorHost(host_, instance, params.pp_resource()));

- }

// Flash interfaces.

if (GetPermissions().HasPermission(ppapi::PERMISSION_FLASH)) {