← Back to branch summary

~zaspire/oxide/push-messaging

« back to all changes in this revision

Viewing changes to shared/browser/permissions/oxide_permission_request_dispatcher.cc

  • Committer: Chris Coulson
  • Date: 2015-06-12 00:22:09 UTC
  • mfrom: (640.1.304 canary)
  • Revision ID: chris.coulson@canonical.com-20150612002209-ycozz1yi479zcaid
Bump Chromium rev to 45.0.2427.7

Show diffs side-by-side

added added

removed removed

Lines of Context:
shared/browser/permissions/oxide_permission_request_dispatcher.cc
22
22
#include "base/logging.h"
23
23
#include "content/public/browser/render_frame_host.h"
24
24
#include "content/public/browser/render_process_host.h"
25
 
#include "content/public/browser/render_view_host.h"
26
25
#include "content/public/browser/web_contents.h"
27
26
#include "url/gurl.h"
28
27
 
114
113
 
115
114
void PermissionRequestDispatcher::RequestPermission(
116
115
    content::PermissionType permission,
 
116
    content::RenderFrameHost* render_frame_host,
117
117
    int request_id,
118
118
    const GURL& requesting_origin,
119
119
    const PermissionRequestCallback& callback) {
123
123
  }
124
124
 
125
125
  PermissionRequestID id(
126
 
      contents_->GetRenderProcessHost()->GetID(),
127
 
      contents_->GetRenderViewHost()->GetRoutingID(),
 
126
      render_frame_host->GetProcess()->GetID(),
 
127
      render_frame_host->GetRoutingID(),
128
128
      request_id,
129
129
      requesting_origin);
130
130
 
148
148
 
149
149
void PermissionRequestDispatcher::CancelPermissionRequest(
150
150
    content::PermissionType permission,
 
151
    content::RenderFrameHost* render_frame_host,
151
152
    int request_id,
152
153
    const GURL& requesting_origin) {
153
154
  PermissionRequestID id(
154
 
      contents_->GetRenderProcessHost()->GetID(),
155
 
      contents_->GetRenderViewHost()->GetRoutingID(),
 
155
      render_frame_host->GetProcess()->GetID(),
 
156
      render_frame_host->GetRoutingID(),
156
157
      request_id,
157
158
      requesting_origin);
158
159