ScreenCapture for Android phase1, part II

chrome/browser/permissions/grouped_permission_infobar_delegate.cc

Index: chrome/browser/permissions/grouped_permission_infobar_delegate.cc
diff --git a/chrome/browser/permissions/grouped_permission_infobar_delegate.cc b/chrome/browser/permissions/grouped_permission_infobar_delegate.cc
index 4e1834f1d728452327fead4284d1bc6279f1d66b..96068ea83a4f41d9433dd353adab3d30824087e3 100644
--- a/chrome/browser/permissions/grouped_permission_infobar_delegate.cc
+++ b/chrome/browser/permissions/grouped_permission_infobar_delegate.cc
@@ -62,6 +62,8 @@ int GroupedPermissionInfoBarDelegate::GetIconIdForPermission(int index) const {
     return IDR_INFOBAR_MEDIA_STREAM_MIC;
   } else if (type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA) {
     return IDR_INFOBAR_MEDIA_STREAM_CAMERA;
+  } else if (type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_SCREEN) {
+    return IDR_INFOBAR_MEDIA_STREAM_SCREEN;
   }
   return IDR_INFOBAR_WARNING;
 }
@@ -71,7 +73,9 @@ base::string16 GroupedPermissionInfoBarDelegate::GetMessageTextFragment(
   DCHECK(index >= 0 && index < static_cast<int>(types_.size()));
   ContentSettingsType type = types_[index];
   int message_id;
-  if (type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) {
+  if (type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_SCREEN) {
+    message_id = IDS_MEDIA_CAPTURE_SCREEN_PERMISSION_FRAGMENT;
+  } else if (type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) {
     message_id = IDS_MEDIA_CAPTURE_AUDIO_ONLY_PERMISSION_FRAGMENT;
   } else if (type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA) {
     message_id = IDS_MEDIA_CAPTURE_VIDEO_ONLY_PERMISSION_FRAGMENT;