content/browser/renderer_host/pepper/content_browser_pepper_host_factory.cc - Issue 11411357: PPB_HostResolver_Private is switched to the new Pepper proxy.

Unified Diff: content/browser/renderer_host/pepper/content_browser_pepper_host_factory.cc

Issue 11411357: PPB_HostResolver_Private is switched to the new Pepper proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed MockPluginDelegate. Created 8 years 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 | « chrome/test/ppapi/ppapi_browsertest.cc ('k') | content/browser/renderer_host/pepper/pepper_host_resolver_private_host.h » ('j') | content/browser/renderer_host/pepper/pepper_host_resolver_private_shared.h » ('J')
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 fd9a13a29f7a67869694987804b601f9ed335843..b89d7ee7b380f3e261f55b7c1b61491fee314cfc 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

@@ -8,6 +8,7 @@

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

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

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

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

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

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

#include "ppapi/host/resource_host.h"

@@ -44,6 +45,17 @@ scoped_ptr<ResourceHost> ContentBrowserPepperHostFactory::CreateResourceHost(

host_, instance, params.pp_resource()));

}

+ // Private interfaces.

+ if (host_->GetPpapiHost()->permissions().HasPermission(

yzshen1 2012/12/20 20:00:20 Now that there is a GetPermissions() method, pleas

ygorshenin1 2012/12/21 12:53:26 Done.

+ ppapi::PERMISSION_PRIVATE) ||

+ message.type() == PpapiHostMsg_HostResolverPrivate_Create::ID) {

yzshen1 2012/12/20 20:00:20 Adding a comment about why we need an '||' here wo

ygorshenin1 2012/12/21 12:53:26 Done. I added code that checks for a plugin that

+ switch (message.type()) {

+ case PpapiHostMsg_HostResolverPrivate_Create::ID:

+ return scoped_ptr<ResourceHost>(new PepperHostResolverPrivateHost(

+ host_, instance, params.pp_resource()));

+ }

// Dev interfaces.

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

switch (message.type()) {