← Back to branch summary

~zaspire/oxide/push-messaging

« back to all changes in this revision

Viewing changes to shared/browser/permissions/oxide_permission_request_id.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_id.cc
20
20
namespace oxide {
21
21
 
22
22
PermissionRequestID::PermissionRequestID(int render_process_id,
23
 
                                         int render_view_id,
24
 
                                         int bridge_id,
 
23
                                         int render_frame_id,
 
24
                                         int request_id,
25
25
                                         const GURL& origin)
26
26
    : render_process_id_(render_process_id),
27
 
      render_view_id_(render_view_id),
28
 
      bridge_id_(bridge_id),
 
27
      render_frame_id_(render_frame_id),
 
28
      request_id_(request_id),
29
29
      origin_(origin) {}
30
30
 
31
31
PermissionRequestID::PermissionRequestID()
32
32
    : render_process_id_(-1),
33
 
      render_view_id_(-1),
34
 
      bridge_id_(-1) {}
 
33
      render_frame_id_(-1),
 
34
      request_id_(-1) {}
35
35
 
36
36
PermissionRequestID::~PermissionRequestID() {}
37
37
 
38
38
bool PermissionRequestID::IsValid() const {
39
 
  return render_process_id_ > -1 && render_view_id_ > -1 && bridge_id_ > -1;
 
39
  return render_process_id_ > -1 && render_frame_id_ > -1 && request_id_ > -1;
40
40
}
41
41
 
42
42
bool PermissionRequestID::operator==(const PermissionRequestID& other) const {
43
43
  return render_process_id_ == other.render_process_id_ &&
44
 
         render_view_id_ == other.render_view_id_ &&
45
 
         bridge_id_ == other.bridge_id_ &&
 
44
         render_frame_id_ == other.render_frame_id_ &&
 
45
         request_id_ == other.request_id_ &&
46
46
         origin_ == other.origin_;
47
47
}
48
48