| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/permissions/permission_infobar_delegate.h" | 5 #include "chrome/browser/permissions/permission_infobar_delegate.h" |
| 6 | 6 |
| 7 #include "chrome/browser/permissions/permission_context_uma_util.h" | 7 #include "chrome/browser/permissions/permission_context_uma_util.h" |
| 8 #include "chrome/browser/permissions/permission_queue_controller.h" | |
| 9 #include "chrome/grit/generated_resources.h" | 8 #include "chrome/grit/generated_resources.h" |
| 10 #include "components/infobars/core/infobar.h" | 9 #include "components/infobars/core/infobar.h" |
| 11 #include "ui/base/l10n/l10n_util.h" | 10 #include "ui/base/l10n/l10n_util.h" |
| 12 | 11 |
| 13 PermissionInfobarDelegate::~PermissionInfobarDelegate() { | 12 PermissionInfobarDelegate::~PermissionInfobarDelegate() { |
| 14 if (!action_taken_) | 13 if (!action_taken_) |
| 15 PermissionContextUmaUtil::PermissionIgnored(type_, requesting_origin_); | 14 PermissionContextUmaUtil::PermissionIgnored(type_, requesting_origin_); |
| 16 } | 15 } |
| 17 | 16 |
| 18 PermissionInfobarDelegate::PermissionInfobarDelegate( | 17 PermissionInfobarDelegate::PermissionInfobarDelegate( |
| 19 PermissionQueueController* controller, | |
| 20 const PermissionRequestID& id, | 18 const PermissionRequestID& id, |
| 21 const GURL& requesting_origin, | 19 const GURL& requesting_origin, |
| 22 ContentSettingsType type) | 20 ContentSettingsType type, |
| 23 : controller_(controller), id_(id), requesting_origin_(requesting_origin), | 21 const base::Callback<void(bool, bool)>& callback) |
| 22 : id_(id), requesting_origin_(requesting_origin), |
| 24 action_taken_(false), | 23 action_taken_(false), |
| 25 type_(type) { | 24 type_(type), |
| 25 callback_(callback) { |
| 26 } | 26 } |
| 27 | 27 |
| 28 infobars::InfoBarDelegate::Type | 28 infobars::InfoBarDelegate::Type |
| 29 PermissionInfobarDelegate::GetInfoBarType() const { | 29 PermissionInfobarDelegate::GetInfoBarType() const { |
| 30 return PAGE_ACTION_TYPE; | 30 return PAGE_ACTION_TYPE; |
| 31 } | 31 } |
| 32 | 32 |
| 33 void PermissionInfobarDelegate::InfoBarDismissed() { | 33 void PermissionInfobarDelegate::InfoBarDismissed() { |
| 34 SetPermission(false, false); | 34 SetPermission(false, false); |
| 35 } | 35 } |
| (...skipping 15 matching lines...) Expand all Loading... |
| 51 } | 51 } |
| 52 | 52 |
| 53 bool PermissionInfobarDelegate::Cancel() { | 53 bool PermissionInfobarDelegate::Cancel() { |
| 54 SetPermission(true, false); | 54 SetPermission(true, false); |
| 55 return true; | 55 return true; |
| 56 } | 56 } |
| 57 | 57 |
| 58 void PermissionInfobarDelegate::SetPermission(bool update_content_setting, | 58 void PermissionInfobarDelegate::SetPermission(bool update_content_setting, |
| 59 bool allowed) { | 59 bool allowed) { |
| 60 action_taken_ = true; | 60 action_taken_ = true; |
| 61 controller_->OnPermissionSet( | 61 callback_.Run(update_content_setting, allowed); |
| 62 id_, requesting_origin_, | |
| 63 InfoBarService::WebContentsFromInfoBar( | |
| 64 infobar())->GetLastCommittedURL().GetOrigin(), | |
| 65 update_content_setting, allowed); | |
| 66 } | 62 } |
| OLD | NEW |