| 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_request_impl.h" | 5 #include "chrome/browser/permissions/permission_request_impl.h" |
| 6 | 6 |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "chrome/browser/permissions/permission_uma_util.h" | 8 #include "chrome/browser/permissions/permission_uma_util.h" |
| 9 #include "chrome/browser/permissions/permission_util.h" | 9 #include "chrome/browser/permissions/permission_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 "net/base/escape.h" | 12 #include "net/base/escape.h" |
| 13 #include "ui/base/l10n/l10n_util.h" | 13 #include "ui/base/l10n/l10n_util.h" |
| 14 | 14 |
| 15 #if defined(OS_ANDROID) | 15 #if defined(OS_ANDROID) |
| 16 #include "chrome/browser/android/android_theme_resources.h" | 16 #include "chrome/browser/android/android_theme_resources.h" |
| 17 #else | 17 #else |
| 18 #include "chrome/app/vector_icons/vector_icons.h" | 18 #include "chrome/app/vector_icons/vector_icons.h" |
| 19 #include "ui/vector_icons/vector_icons.h" | 19 #include "ui/vector_icons/vector_icons.h" |
| 20 #endif | 20 #endif |
| 21 | 21 |
| 22 PermissionRequestImpl::PermissionRequestImpl( | 22 PermissionRequestImpl::PermissionRequestImpl( |
| 23 const GURL& request_origin, | 23 const GURL& request_origin, |
| 24 content::PermissionType permission_type, | 24 ContentSettingsType content_settings_type, |
| 25 Profile* profile, | 25 Profile* profile, |
| 26 bool has_gesture, | 26 bool has_gesture, |
| 27 const PermissionDecidedCallback& permission_decided_callback, | 27 const PermissionDecidedCallback& permission_decided_callback, |
| 28 const base::Closure delete_callback) | 28 const base::Closure delete_callback) |
| 29 : request_origin_(request_origin), | 29 : request_origin_(request_origin), |
| 30 permission_type_(permission_type), | 30 content_settings_type_(content_settings_type), |
| 31 profile_(profile), | 31 profile_(profile), |
| 32 has_gesture_(has_gesture), | 32 has_gesture_(has_gesture), |
| 33 permission_decided_callback_(permission_decided_callback), | 33 permission_decided_callback_(permission_decided_callback), |
| 34 delete_callback_(delete_callback), | 34 delete_callback_(delete_callback), |
| 35 is_finished_(false), | 35 is_finished_(false), |
| 36 action_taken_(false) {} | 36 action_taken_(false) {} |
| 37 | 37 |
| 38 PermissionRequestImpl::~PermissionRequestImpl() { | 38 PermissionRequestImpl::~PermissionRequestImpl() { |
| 39 DCHECK(is_finished_); | 39 DCHECK(is_finished_); |
| 40 if (!action_taken_) { | 40 if (!action_taken_) { |
| 41 PermissionUmaUtil::PermissionIgnored(permission_type_, GetGestureType(), | 41 PermissionUmaUtil::PermissionIgnored( |
| 42 request_origin_, profile_); | 42 content_settings_type_, GetGestureType(), request_origin_, profile_); |
| 43 PermissionUmaUtil::RecordPermissionEmbargoStatus( | 43 PermissionUmaUtil::RecordPermissionEmbargoStatus( |
| 44 PermissionEmbargoStatus::NOT_EMBARGOED); | 44 PermissionEmbargoStatus::NOT_EMBARGOED); |
| 45 } | 45 } |
| 46 } | 46 } |
| 47 | 47 |
| 48 PermissionRequest::IconId PermissionRequestImpl::GetIconId() const { | 48 PermissionRequest::IconId PermissionRequestImpl::GetIconId() const { |
| 49 #if defined(OS_ANDROID) | 49 #if defined(OS_ANDROID) |
| 50 switch (permission_type_) { | 50 switch (content_settings_type_) { |
| 51 case content::PermissionType::GEOLOCATION: | 51 case CONTENT_SETTINGS_TYPE_GEOLOCATION: |
| 52 return IDR_ANDROID_INFOBAR_GEOLOCATION; | 52 return IDR_ANDROID_INFOBAR_GEOLOCATION; |
| 53 case content::PermissionType::NOTIFICATIONS: | 53 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: |
| 54 case content::PermissionType::PUSH_MESSAGING: | 54 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: |
| 55 return IDR_ANDROID_INFOBAR_NOTIFICATIONS; | 55 return IDR_ANDROID_INFOBAR_NOTIFICATIONS; |
| 56 case content::PermissionType::MIDI_SYSEX: | 56 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: |
| 57 return IDR_ANDROID_INFOBAR_MIDI; | 57 return IDR_ANDROID_INFOBAR_MIDI; |
| 58 case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: | 58 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: |
| 59 return IDR_ANDROID_INFOBAR_PROTECTED_MEDIA_IDENTIFIER; | 59 return IDR_ANDROID_INFOBAR_PROTECTED_MEDIA_IDENTIFIER; |
| 60 default: | 60 default: |
| 61 NOTREACHED(); | 61 NOTREACHED(); |
| 62 return IDR_ANDROID_INFOBAR_WARNING; | 62 return IDR_ANDROID_INFOBAR_WARNING; |
| 63 } | 63 } |
| 64 #else | 64 #else |
| 65 switch (permission_type_) { | 65 switch (content_settings_type_) { |
| 66 case content::PermissionType::GEOLOCATION: | 66 case CONTENT_SETTINGS_TYPE_GEOLOCATION: |
| 67 return ui::kLocationOnIcon; | 67 return ui::kLocationOnIcon; |
| 68 case content::PermissionType::NOTIFICATIONS: | 68 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: |
| 69 case content::PermissionType::PUSH_MESSAGING: | 69 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: |
| 70 return ui::kNotificationsIcon; | 70 return ui::kNotificationsIcon; |
| 71 #if defined(OS_CHROMEOS) | 71 #if defined(OS_CHROMEOS) |
| 72 // TODO(xhwang): fix this icon, see crrev.com/863263007 | 72 // TODO(xhwang): fix this icon, see crrev.com/863263007 |
| 73 case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: | 73 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: |
| 74 return kProductIcon; | 74 return kProductIcon; |
| 75 #endif | 75 #endif |
| 76 case content::PermissionType::MIDI_SYSEX: | 76 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: |
| 77 return ui::kMidiIcon; | 77 return ui::kMidiIcon; |
| 78 case content::PermissionType::FLASH: | 78 case CONTENT_SETTINGS_TYPE_PLUGINS: |
| 79 return ui::kExtensionIcon; | 79 return ui::kExtensionIcon; |
| 80 default: | 80 default: |
| 81 NOTREACHED(); | 81 NOTREACHED(); |
| 82 return ui::kExtensionIcon; | 82 return ui::kExtensionIcon; |
| 83 } | 83 } |
| 84 #endif | 84 #endif |
| 85 } | 85 } |
| 86 | 86 |
| 87 base::string16 PermissionRequestImpl::GetMessageTextFragment() const { | 87 base::string16 PermissionRequestImpl::GetMessageTextFragment() const { |
| 88 int message_id; | 88 int message_id; |
| 89 switch (permission_type_) { | 89 switch (content_settings_type_) { |
| 90 case content::PermissionType::GEOLOCATION: | 90 case CONTENT_SETTINGS_TYPE_GEOLOCATION: |
| 91 message_id = IDS_GEOLOCATION_INFOBAR_PERMISSION_FRAGMENT; | 91 message_id = IDS_GEOLOCATION_INFOBAR_PERMISSION_FRAGMENT; |
| 92 break; | 92 break; |
| 93 case content::PermissionType::NOTIFICATIONS: | 93 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: |
| 94 case content::PermissionType::PUSH_MESSAGING: | 94 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: |
| 95 message_id = IDS_NOTIFICATION_PERMISSIONS_FRAGMENT; | 95 message_id = IDS_NOTIFICATION_PERMISSIONS_FRAGMENT; |
| 96 break; | 96 break; |
| 97 case content::PermissionType::MIDI_SYSEX: | 97 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: |
| 98 message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT; | 98 message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT; |
| 99 break; | 99 break; |
| 100 #if defined(OS_CHROMEOS) | 100 #if defined(OS_CHROMEOS) |
| 101 case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: | 101 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: |
| 102 message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT; | 102 message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT; |
| 103 break; | 103 break; |
| 104 #endif | 104 #endif |
| 105 case content::PermissionType::FLASH: | 105 case CONTENT_SETTINGS_TYPE_PLUGINS: |
| 106 message_id = IDS_FLASH_PERMISSION_FRAGMENT; | 106 message_id = IDS_FLASH_PERMISSION_FRAGMENT; |
| 107 break; | 107 break; |
| 108 default: | 108 default: |
| 109 NOTREACHED(); | 109 NOTREACHED(); |
| 110 return base::string16(); | 110 return base::string16(); |
| 111 } | 111 } |
| 112 return l10n_util::GetStringUTF16(message_id); | 112 return l10n_util::GetStringUTF16(message_id); |
| 113 } | 113 } |
| 114 | 114 |
| 115 GURL PermissionRequestImpl::GetOrigin() const { | 115 GURL PermissionRequestImpl::GetOrigin() const { |
| (...skipping 14 matching lines...) Expand all Loading... |
| 130 RegisterActionTaken(); | 130 RegisterActionTaken(); |
| 131 permission_decided_callback_.Run(false, CONTENT_SETTING_DEFAULT); | 131 permission_decided_callback_.Run(false, CONTENT_SETTING_DEFAULT); |
| 132 } | 132 } |
| 133 | 133 |
| 134 void PermissionRequestImpl::RequestFinished() { | 134 void PermissionRequestImpl::RequestFinished() { |
| 135 is_finished_ = true; | 135 is_finished_ = true; |
| 136 delete_callback_.Run(); | 136 delete_callback_.Run(); |
| 137 } | 137 } |
| 138 | 138 |
| 139 bool PermissionRequestImpl::ShouldShowPersistenceToggle() const { | 139 bool PermissionRequestImpl::ShouldShowPersistenceToggle() const { |
| 140 return (permission_type_ == content::PermissionType::GEOLOCATION) && | 140 return (content_settings_type_ == CONTENT_SETTINGS_TYPE_GEOLOCATION) && |
| 141 PermissionUtil::ShouldShowPersistenceToggle(); | 141 PermissionUtil::ShouldShowPersistenceToggle(); |
| 142 } | 142 } |
| 143 | 143 |
| 144 PermissionRequestType PermissionRequestImpl::GetPermissionRequestType() | 144 PermissionRequestType PermissionRequestImpl::GetPermissionRequestType() |
| 145 const { | 145 const { |
| 146 return PermissionUtil::GetRequestType(permission_type_); | 146 return PermissionUtil::GetRequestType(content_settings_type_); |
| 147 } | 147 } |
| 148 | 148 |
| 149 PermissionRequestGestureType PermissionRequestImpl::GetGestureType() | 149 PermissionRequestGestureType PermissionRequestImpl::GetGestureType() |
| 150 const { | 150 const { |
| 151 return PermissionUtil::GetGestureType(has_gesture_); | 151 return PermissionUtil::GetGestureType(has_gesture_); |
| 152 } | 152 } |
| 153 | |
| 154 ContentSettingsType PermissionRequestImpl::GetContentSettingsType() const { | |
| 155 switch (permission_type_) { | |
| 156 case content::PermissionType::GEOLOCATION: | |
| 157 return CONTENT_SETTINGS_TYPE_GEOLOCATION; | |
| 158 case content::PermissionType::PUSH_MESSAGING: | |
| 159 case content::PermissionType::NOTIFICATIONS: | |
| 160 return CONTENT_SETTINGS_TYPE_NOTIFICATIONS; | |
| 161 case content::PermissionType::MIDI_SYSEX: | |
| 162 return CONTENT_SETTINGS_TYPE_MIDI_SYSEX; | |
| 163 #if defined(OS_CHROMEOS) | |
| 164 case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: | |
| 165 return CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER; | |
| 166 #endif | |
| 167 case content::PermissionType::FLASH: | |
| 168 return CONTENT_SETTINGS_TYPE_PLUGINS; | |
| 169 default: | |
| 170 NOTREACHED(); | |
| 171 return CONTENT_SETTINGS_TYPE_DEFAULT; | |
| 172 } | |
| 173 } | |
| OLD | NEW |