Permissions: Add new Infobar to support grouped permission requests on Android

chrome/browser/ui/android/infobars/confirm_infobar.cc

 // Copyright 2013 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/ui/android/infobars/confirm_infobar.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/android/jni_android.h"
@@ skipping 50 matching lines @@
   ScopedJavaLocalRef<jobject> java_bitmap;
   if (delegate->GetIconId() == infobars::InfoBarDelegate::kNoIconID &&
       !delegate->GetIcon().IsEmpty()) {
     java_bitmap = gfx::ConvertToJavaBitmap(delegate->GetIcon().ToSkBitmap());
   }
 
   std::vector<int> content_settings;
   if (delegate->AsPermissionInfobarDelegate()) {
     content_settings.push_back(
         delegate->AsPermissionInfobarDelegate()->content_setting());
-  } else if (delegate->AsMediaStreamInfoBarDelegateAndroid()) {
-    MediaStreamInfoBarDelegateAndroid* media_delegate =
-        delegate->AsMediaStreamInfoBarDelegateAndroid();
-    if (media_delegate->IsRequestingVideoAccess()) {
-      content_settings.push_back(
-          ContentSettingsType::CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
-    }
-    if (media_delegate->IsRequestingMicrophoneAccess()) {
-      content_settings.push_back(
-          ContentSettingsType::CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
-    }
   }
 
+  return Java_ConfirmInfoBar_create(
+      env, GetWindowAndroid().obj(), GetEnumeratedIconId(), java_bitmap.obj(),
+      message_text.obj(), link_text.obj(), ok_button_text.obj(),
+      cancel_button_text.obj(),
+      base::android::ToJavaIntArray(env, content_settings).obj());
+}
+
+base::android::ScopedJavaLocalRef<jobject> ConfirmInfoBar::GetWindowAndroid() {
   content::WebContents* web_contents =
       InfoBarService::WebContentsFromInfoBar(this);
   DCHECK(web_contents);
   content::ContentViewCore* cvc =
       content::ContentViewCore::FromWebContents(web_contents);
   DCHECK(cvc);
-  base::android::ScopedJavaLocalRef<jobject> jwindow_android =
-      cvc->GetWindowAndroid()->GetJavaObject();
-
-  return Java_ConfirmInfoBar_create(
-      env, jwindow_android.obj(), GetEnumeratedIconId(), java_bitmap.obj(),
-      message_text.obj(), link_text.obj(), ok_button_text.obj(),
-      cancel_button_text.obj(),
-      base::android::ToJavaIntArray(env, content_settings).obj());
+  return cvc->GetWindowAndroid()->GetJavaObject();
 }
 
 void ConfirmInfoBar::OnLinkClicked(JNIEnv* env,
                                    const JavaParamRef<jobject>& obj) {
   if (!owner())
       return; // We're closing; don't call anything, it might access the owner.
 
   if (GetDelegate()->LinkClicked(NEW_FOREGROUND_TAB))
     RemoveSelf();
 }
@@ skipping 20 matching lines @@
   return (delegate->GetButtons() & button) ?
       delegate->GetButtonLabel(button) : base::string16();
 }
 
 
 // Native JNI methods ---------------------------------------------------------
 
 bool RegisterConfirmInfoBar(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }