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" |
11 #include "components/url_formatter/elide_url.h" | 11 #include "components/url_formatter/elide_url.h" |
12 #include "grit/theme_resources.h" | 12 #include "grit/theme_resources.h" |
13 #include "net/base/escape.h" | 13 #include "net/base/escape.h" |
14 #include "ui/base/l10n/l10n_util.h" | 14 #include "ui/base/l10n/l10n_util.h" |
15 #include "ui/gfx/vector_icons_public.h" | 15 #include "ui/gfx/vector_icons_public.h" |
16 | 16 |
17 PermissionBubbleRequestImpl::PermissionBubbleRequestImpl( | 17 PermissionBubbleRequestImpl::PermissionBubbleRequestImpl( |
18 const GURL& request_origin, | 18 const GURL& request_origin, |
19 content::PermissionType permission_type, | 19 content::PermissionType permission_type, |
| 20 Profile* profile, |
20 const PermissionDecidedCallback& permission_decided_callback, | 21 const PermissionDecidedCallback& permission_decided_callback, |
21 const base::Closure delete_callback) | 22 const base::Closure delete_callback) |
22 : request_origin_(request_origin), | 23 : request_origin_(request_origin), |
23 permission_type_(permission_type), | 24 permission_type_(permission_type), |
| 25 profile_(profile), |
24 permission_decided_callback_(permission_decided_callback), | 26 permission_decided_callback_(permission_decided_callback), |
25 delete_callback_(delete_callback), | 27 delete_callback_(delete_callback), |
26 is_finished_(false), | 28 is_finished_(false), |
27 action_taken_(false) {} | 29 action_taken_(false) {} |
28 | 30 |
29 PermissionBubbleRequestImpl::~PermissionBubbleRequestImpl() { | 31 PermissionBubbleRequestImpl::~PermissionBubbleRequestImpl() { |
30 DCHECK(is_finished_); | 32 DCHECK(is_finished_); |
31 if (!action_taken_) | 33 if (!action_taken_) |
32 // TODO(stefanocs): Pass in a non null profile. | |
33 PermissionUmaUtil::PermissionIgnored(permission_type_, request_origin_, | 34 PermissionUmaUtil::PermissionIgnored(permission_type_, request_origin_, |
34 nullptr); | 35 profile_); |
35 } | 36 } |
36 | 37 |
37 gfx::VectorIconId PermissionBubbleRequestImpl::GetVectorIconId() const { | 38 gfx::VectorIconId PermissionBubbleRequestImpl::GetVectorIconId() const { |
38 #if !defined(OS_MACOSX) | 39 #if !defined(OS_MACOSX) |
39 switch (permission_type_) { | 40 switch (permission_type_) { |
40 case content::PermissionType::GEOLOCATION: | 41 case content::PermissionType::GEOLOCATION: |
41 return gfx::VectorIconId::LOCATION_ON; | 42 return gfx::VectorIconId::LOCATION_ON; |
42 #if defined(ENABLE_NOTIFICATIONS) | 43 #if defined(ENABLE_NOTIFICATIONS) |
43 case content::PermissionType::NOTIFICATIONS: | 44 case content::PermissionType::NOTIFICATIONS: |
44 case content::PermissionType::PUSH_MESSAGING: | 45 case content::PermissionType::PUSH_MESSAGING: |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
149 return PermissionBubbleType::PERMISSION_PUSH_MESSAGING; | 150 return PermissionBubbleType::PERMISSION_PUSH_MESSAGING; |
150 #if defined(OS_CHROMEOS) | 151 #if defined(OS_CHROMEOS) |
151 case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: | 152 case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: |
152 return PermissionBubbleType::PERMISSION_PROTECTED_MEDIA_IDENTIFIER; | 153 return PermissionBubbleType::PERMISSION_PROTECTED_MEDIA_IDENTIFIER; |
153 #endif | 154 #endif |
154 default: | 155 default: |
155 NOTREACHED(); | 156 NOTREACHED(); |
156 return PermissionBubbleType::UNKNOWN; | 157 return PermissionBubbleType::UNKNOWN; |
157 } | 158 } |
158 } | 159 } |
OLD | NEW |