Grouped requests

chrome/browser/permissions/permission_request_impl.cc

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 3c208d1f2eaab0c71d8f88bc520bab15f3398174..ae273d88c4aa5872981211f2a7fc4fc5fec588f5 100644
--- a/chrome/browser/permissions/permission_request_impl.cc
+++ b/chrome/browser/permissions/permission_request_impl.cc
@@ -64,6 +64,9 @@ PermissionRequest::IconId PermissionRequestImpl::GetIconId() const {
       return IDR_ANDROID_INFOBAR_MIDI;
     case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
       return IDR_ANDROID_INFOBAR_PROTECTED_MEDIA_IDENTIFIER;
+    case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
+      return IDR_INFOBAR_MEDIA_STREAM_MIC case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA
+          : return IDR_INFOBAR_MEDIA_STREAM_CAMERA;
     default:
       NOTREACHED();
       return IDR_ANDROID_INFOBAR_WARNING;
@@ -84,6 +87,10 @@ PermissionRequest::IconId PermissionRequestImpl::GetIconId() const {
       return ui::kMidiIcon;
     case CONTENT_SETTINGS_TYPE_PLUGINS:
       return kExtensionIcon;
+    case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
+      return ui::kMicrophoneIcon;
+    case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
+      return ui::kVideocamIcon;
     default:
       NOTREACHED();
       return kExtensionIcon;
@@ -112,6 +119,12 @@ base::string16 PermissionRequestImpl::GetMessageTextFragment() const {
     case CONTENT_SETTINGS_TYPE_PLUGINS:
       message_id = IDS_FLASH_PERMISSION_FRAGMENT;
       break;
+    case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
+      message_id = IDS_MEDIA_CAPTURE_AUDIO_ONLY_PERMISSION_FRAGMENT;
+      break;
+    case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
+      message_id = IDS_MEDIA_CAPTURE_VIDEO_ONLY_PERMISSION_FRAGMENT;
+      break;
     default:
       NOTREACHED();
       return base::string16();