← Back to branch summary

~osomon/oxide/fix-crash-popup-menu

« back to all changes in this revision

Viewing changes to shared/browser/oxide_pepper_host_factory_browser.cc

  • Committer: Chris Coulson
  • Date: 2015-04-24 00:27:16 UTC
  • mfrom: (640.1.248 canary)
  • Revision ID: chris.coulson@canonical.com-20150424002716-rz2vs6ts1vgi6uvr
Bump Chromium rev to 44.0.2376.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
shared/browser/oxide_pepper_host_factory_browser.cc
25
25
#include "ppapi/proxy/ppapi_messages.h"
26
26
#include "ppapi/shared_impl/ppapi_permissions.h"
27
27
 
28
 
#include "oxide_pepper_talk_host.h"
29
 
 
30
28
namespace oxide {
31
29
 
32
30
PepperHostFactoryBrowser::PepperHostFactoryBrowser(
43
41
  DCHECK(host == host_->GetPpapiHost());
44
42
 
45
43
  if (!host_->IsValidInstance(instance)) {
46
 
    return scoped_ptr<ppapi::host::ResourceHost>();
 
44
    return nullptr;
47
45
  }
48
46
 
49
47
  // Dev interfaces:
53
51
  // Private interfaces:
54
52
  // TODO:
55
53
  //  PpapiHostMsg_Broker_Create
56
 
  if (host_->GetPpapiHost()->permissions().HasPermission(
57
 
          ppapi::PERMISSION_PRIVATE) &&
58
 
      message.type() == PpapiHostMsg_Talk_Create::ID) {
59
 
    return scoped_ptr<ppapi::host::ResourceHost>(new PepperTalkHost(
60
 
        host_, instance, resource));
61
 
  }
62
54
 
63
55
  // Flash interfaces:
64
56
  // TODO:
66
58
  //  PpapiHostMsg_FlashClipboard_Create
67
59
  //  PpapiHostMsg_FlashDRM_Create
68
60
 
69
 
  return scoped_ptr<ppapi::host::ResourceHost>();
 
61
  return nullptr;
70
62
}
71
63
 
72
64
} // namespace oxide