Chromium Code Reviews| Index: chrome/browser/permissions/permission_request_impl.cc |
| diff --git a/chrome/browser/permissions/permission_request_impl.cc b/chrome/browser/permissions/permission_request_impl.cc |
| index f4e8a0185e78415a2af0b0000ccf9558def52dc2..a6e0e05183d5c49ec2994cabb174b11dee695201 100644 |
| --- a/chrome/browser/permissions/permission_request_impl.cc |
| +++ b/chrome/browser/permissions/permission_request_impl.cc |
| @@ -8,11 +8,16 @@ |
| #include "chrome/browser/permissions/permission_uma_util.h" |
| #include "chrome/browser/permissions/permission_util.h" |
| #include "chrome/grit/generated_resources.h" |
| +#include "chrome/grit/theme_resources.h" |
| #include "components/url_formatter/elide_url.h" |
| #include "net/base/escape.h" |
| #include "ui/base/l10n/l10n_util.h" |
| #include "ui/gfx/vector_icons_public.h" |
| +#if defined(OS_ANDROID) |
| +#include "chrome/browser/android/android_theme_resources.h" |
| +#endif |
| + |
| PermissionRequestImpl::PermissionRequestImpl( |
| const GURL& request_origin, |
| content::PermissionType permission_type, |
| @@ -38,6 +43,26 @@ PermissionRequestImpl::~PermissionRequestImpl() { |
| } |
| PermissionRequest::IconId PermissionRequestImpl::GetIconId() const { |
| +#if defined(OS_ANDROID) |
| + switch (permission_type_) { |
| + case content::PermissionType::GEOLOCATION: |
| + return IDR_ANDROID_INFOBAR_GEOLOCATION; |
| +#if defined(ENABLE_NOTIFICATIONS) |
| + case content::PermissionType::NOTIFICATIONS: |
| + case content::PermissionType::PUSH_MESSAGING: |
| + return IDR_ANDROID_INFOBAR_NOTIFICATIONS; |
| +#endif |
| + case content::PermissionType::MIDI_SYSEX: |
| + return IDR_ANDROID_INFOBAR_MIDI; |
| + case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: |
| + return IDR_ANDROID_INFOBAR_PROTECTED_MEDIA_IDENTIFIER; |
| + case content::PermissionType::FLASH: |
|
raymes
2016/10/19 00:25:41
I don't think we need this on android
lshang
2016/10/20 05:03:10
Done.
|
| + return IDR_ALLOWED_PLUGINS; |
| + default: |
| + NOTREACHED(); |
| + return IDR_ANDROID_INFOBAR_WARNING; |
| + } |
| +#else |
| switch (permission_type_) { |
| case content::PermissionType::GEOLOCATION: |
| return gfx::VectorIconId::LOCATION_ON; |
| @@ -59,6 +84,7 @@ PermissionRequest::IconId PermissionRequestImpl::GetIconId() const { |
| NOTREACHED(); |
| return gfx::VectorIconId::VECTOR_ICON_NONE; |
| } |
| +#endif |
| } |
| base::string16 PermissionRequestImpl::GetMessageTextFragment() const { |