| Index: components/content_settings/core/common/permission_request_id.cc
|
| diff --git a/components/content_settings/core/common/permission_request_id.cc b/components/content_settings/core/common/permission_request_id.cc
|
| index 0d963a4a752a923ccca26e617b12eefc9a9054cb..9a47ff8fcffa7d54fbe1e2354c2c5689c2631b19 100644
|
| --- a/components/content_settings/core/common/permission_request_id.cc
|
| +++ b/components/content_settings/core/common/permission_request_id.cc
|
| @@ -7,11 +7,11 @@
|
| #include "base/strings/stringprintf.h"
|
|
|
| PermissionRequestID::PermissionRequestID(int render_process_id,
|
| - int render_view_id,
|
| + int render_frame_id,
|
| int bridge_id,
|
| const GURL& origin)
|
| : render_process_id_(render_process_id),
|
| - render_view_id_(render_view_id),
|
| + render_frame_id_(render_frame_id),
|
| bridge_id_(bridge_id),
|
| origin_(origin) {
|
| }
|
| @@ -27,13 +27,13 @@ bool PermissionRequestID::Equals(const PermissionRequestID& other) const {
|
| bool PermissionRequestID::IsForSameTabAs(
|
| const PermissionRequestID& other) const {
|
| return (render_process_id_ == other.render_process_id_) &&
|
| - (render_view_id_ == other.render_view_id_);
|
| + (render_frame_id_ == other.render_frame_id_);
|
| }
|
|
|
| std::string PermissionRequestID::ToString() const {
|
| return base::StringPrintf("%d,%d,%d,%s",
|
| render_process_id_,
|
| - render_view_id_,
|
| + render_frame_id_,
|
| bridge_id_,
|
| origin_.spec().c_str());
|
| }
|
|
|