Make PermissionRequest::GetIconId return different types on desktop and Android so that the IDR_ an…

chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/permissions/grouped_permission_infobar_delegate_android.h"
 
 #include "base/memory/ptr_util.h"
+#include "chrome/browser/android/android_theme_resources.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/permissions/permission_util.h"
 #include "chrome/browser/ui/android/infobars/grouped_permission_infobar.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/infobars/core/infobar.h"
 #include "components/url_formatter/elide_url.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/strings/grit/ui_strings.h"
 
@@ skipping 21 matching lines @@
 
 int GroupedPermissionInfoBarDelegate::GetIconIdForPermission(
     size_t position) const {
   DCHECK_LT(position, types_.size());
   ContentSettingsType type = types_[position];
   if (type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC)
     return IDR_INFOBAR_MEDIA_STREAM_MIC;
   if (type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA)
     return IDR_INFOBAR_MEDIA_STREAM_CAMERA;
 
-  return IDR_INFOBAR_WARNING;
+  return IDR_ANDROID_INFOBAR_WARNING;
 }
 
 base::string16 GroupedPermissionInfoBarDelegate::GetMessageTextFragment(
     size_t position) const {
   DCHECK_LT(position, types_.size());
   ContentSettingsType type = types_[position];
 
   const bool is_mic = (type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
   DCHECK(is_mic || (type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
   return l10n_util::GetStringUTF16(
@@ skipping 47 matching lines @@
 base::string16 GroupedPermissionInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
   if (permission_count() > 1) {
     return l10n_util::GetStringUTF16((button == BUTTON_OK) ? IDS_APP_OK
                                                            : IDS_APP_CANCEL);
   }
 
   return l10n_util::GetStringUTF16((button == BUTTON_OK) ? IDS_PERMISSION_ALLOW
                                                          : IDS_PERMISSION_DENY);
 }