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_bubble_request_impl.h" | 5 #include "chrome/browser/permissions/permission_bubble_request_impl.h" |
6 | 6 |
7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
8 #include "chrome/browser/permissions/permission_context_base.h" | 8 #include "chrome/browser/permissions/permission_context_base.h" |
9 #include "chrome/browser/permissions/permission_uma_util.h" | 9 #include "chrome/browser/permissions/permission_uma_util.h" |
10 #include "chrome/grit/generated_resources.h" | 10 #include "chrome/grit/generated_resources.h" |
(...skipping 11 matching lines...) Expand all Loading... |
22 : request_origin_(request_origin), | 22 : request_origin_(request_origin), |
23 permission_type_(permission_type), | 23 permission_type_(permission_type), |
24 permission_decided_callback_(permission_decided_callback), | 24 permission_decided_callback_(permission_decided_callback), |
25 delete_callback_(delete_callback), | 25 delete_callback_(delete_callback), |
26 is_finished_(false), | 26 is_finished_(false), |
27 action_taken_(false) {} | 27 action_taken_(false) {} |
28 | 28 |
29 PermissionBubbleRequestImpl::~PermissionBubbleRequestImpl() { | 29 PermissionBubbleRequestImpl::~PermissionBubbleRequestImpl() { |
30 DCHECK(is_finished_); | 30 DCHECK(is_finished_); |
31 if (!action_taken_) | 31 if (!action_taken_) |
32 PermissionUmaUtil::PermissionIgnored(permission_type_, request_origin_); | 32 // TODO(stefanocs): Pass in a non null profile. |
| 33 PermissionUmaUtil::PermissionIgnored(permission_type_, request_origin_, |
| 34 nullptr); |
33 } | 35 } |
34 | 36 |
35 gfx::VectorIconId PermissionBubbleRequestImpl::GetVectorIconId() const { | 37 gfx::VectorIconId PermissionBubbleRequestImpl::GetVectorIconId() const { |
36 #if !defined(OS_MACOSX) | 38 #if !defined(OS_MACOSX) |
37 switch (permission_type_) { | 39 switch (permission_type_) { |
38 case content::PermissionType::GEOLOCATION: | 40 case content::PermissionType::GEOLOCATION: |
39 return gfx::VectorIconId::LOCATION_ON; | 41 return gfx::VectorIconId::LOCATION_ON; |
40 #if defined(ENABLE_NOTIFICATIONS) | 42 #if defined(ENABLE_NOTIFICATIONS) |
41 case content::PermissionType::NOTIFICATIONS: | 43 case content::PermissionType::NOTIFICATIONS: |
42 return gfx::VectorIconId::NOTIFICATIONS; | 44 return gfx::VectorIconId::NOTIFICATIONS; |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 return PermissionBubbleType::PERMISSION_PUSH_MESSAGING; | 149 return PermissionBubbleType::PERMISSION_PUSH_MESSAGING; |
148 #if defined(OS_CHROMEOS) | 150 #if defined(OS_CHROMEOS) |
149 case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: | 151 case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: |
150 return PermissionBubbleType::PERMISSION_PROTECTED_MEDIA_IDENTIFIER; | 152 return PermissionBubbleType::PERMISSION_PROTECTED_MEDIA_IDENTIFIER; |
151 #endif | 153 #endif |
152 default: | 154 default: |
153 NOTREACHED(); | 155 NOTREACHED(); |
154 return PermissionBubbleType::UNKNOWN; | 156 return PermissionBubbleType::UNKNOWN; |
155 } | 157 } |
156 } | 158 } |
OLD | NEW |