| 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 7deb63167f4e2cec377d9340886ab6a0b5172c4c..40702569f7c0e634c5a247f515d81556596703ac 100644
|
| --- a/chrome/browser/permissions/permission_request_impl.cc
|
| +++ b/chrome/browser/permissions/permission_request_impl.cc
|
| @@ -15,6 +15,10 @@
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "ui/gfx/vector_icons_public.h"
|
|
|
| +#if defined(OS_ANDROID)
|
| +#include "chrome/browser/android/android_theme_resources.h"
|
| +#endif // OS_ANDROID
|
| +
|
| PermissionRequestImpl::PermissionRequestImpl(
|
| const GURL& request_origin,
|
| content::PermissionType permission_type,
|
| @@ -33,6 +37,16 @@ PermissionRequestImpl::~PermissionRequestImpl() {
|
| PermissionUmaUtil::PermissionIgnored(permission_type_, request_origin_);
|
| }
|
|
|
| +#if defined(OS_ANDROID)
|
| +int PermissionRequestImpl::GetIconId() const {
|
| + switch (permission_type_) {
|
| + case content::PermissionType::GEOLOCATION:
|
| + return IDR_ANDROID_INFOBAR_GEOLOCATION;
|
| + default:
|
| + return IDR_INFOBAR_WARNING;
|
| + }
|
| +}
|
| +#else
|
| gfx::VectorIconId PermissionRequestImpl::GetVectorIconId() const {
|
| #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
| switch (permission_type_) {
|
| @@ -79,6 +93,7 @@ int PermissionRequestImpl::GetIconId() const {
|
| #endif
|
| return icon_id;
|
| }
|
| +#endif
|
|
|
| base::string16 PermissionRequestImpl::GetMessageText() const {
|
| int message_id;
|
|
|