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

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

Index: chrome/browser/ui/android/infobars/grouped_permission_infobar.cc
diff --git a/chrome/browser/ui/android/infobars/grouped_permission_infobar.cc b/chrome/browser/ui/android/infobars/grouped_permission_infobar.cc
new file mode 100644
index 0000000000000000000000000000000000000000..b4e9185247c6cd5a1b7bef01f6e8f76b26e75e13
--- /dev/null
+++ b/chrome/browser/ui/android/infobars/grouped_permission_infobar.cc
@@ -0,0 +1,69 @@
+// 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/ui/android/infobars/grouped_permission_infobar.h"
+
+#include "base/android/jni_android.h"
+#include "base/android/jni_array.h"
+#include "base/android/jni_string.h"
+#include "chrome/browser/android/resource_mapper.h"
+#include "chrome/browser/permissions/grouped_permission_infobar_delegate.h"
+#include "jni/GroupedPermissionInfoBar_jni.h"
+
+GroupedPermissionInfoBar::GroupedPermissionInfoBar(
+    std::unique_ptr<GroupedPermissionInfoBarDelegate> delegate)
+    : ConfirmInfoBar(std::move(delegate)) {}
+
+GroupedPermissionInfoBar::~GroupedPermissionInfoBar() {
+}
+
+bool GroupedPermissionInfoBar::Register(JNIEnv* env) {
+  return RegisterNativesImpl(env);
+}
+
+base::android::ScopedJavaLocalRef<jobject>
+GroupedPermissionInfoBar::CreateRenderInfoBar(JNIEnv* env) {
+  GroupedPermissionInfoBarDelegate* delegate = GetDelegate();
+
+  base::android::ScopedJavaLocalRef<jstring> message_text =
+      base::android::ConvertUTF16ToJavaString(
+          env, delegate->GetMessageText());
+  base::android::ScopedJavaLocalRef<jstring> ok_button_text =
+      base::android::ConvertUTF16ToJavaString(
+          env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_OK));
+  base::android::ScopedJavaLocalRef<jstring> cancel_button_text =
+      base::android::ConvertUTF16ToJavaString(
+          env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_CANCEL));
+
+  std::vector<base::string16> permission_strings;
+  std::vector<int> permission_icons;
+  std::vector<int> content_settings_types;
+
+  for (int i = 0; i < delegate->GetPermissionCount(); i++) {
+    permission_strings.push_back(delegate->GetMessageTextFragment(i));
+    permission_icons.push_back(
+        ResourceMapper::MapFromChromiumId(delegate->GetIconIdForPermission(i)));
+    content_settings_types.push_back(delegate->GetContentSettingType(i));
+  }
+
+  return Java_GroupedPermissionInfoBar_create(
+      env, message_text.obj(), ok_button_text.obj(), cancel_button_text.obj(),
+      base::android::ToJavaIntArray(env, permission_icons).obj(),
+      base::android::ToJavaArrayOfStrings(env, permission_strings).obj(),
+      GetWindowAndroid().obj(),
+      base::android::ToJavaIntArray(env, content_settings_types).obj());
+}
+
+GroupedPermissionInfoBarDelegate* GroupedPermissionInfoBar::GetDelegate() {
+  return static_cast<GroupedPermissionInfoBarDelegate*>(delegate());
+}
+
+// GroupedPermissionInfoBarDelegate:

[gone, 2016/04/19 19:54:32]

Don't think this comment is necessary.

[tsergeant, 2016/04/20 07:26:17]

Done.

+std::unique_ptr<infobars::InfoBar>
+GroupedPermissionInfoBarDelegate::CreateInfoBar(
+    infobars::InfoBarManager* infobar_manager,
+    std::unique_ptr<GroupedPermissionInfoBarDelegate> delegate) {
+  return std::unique_ptr<infobars::InfoBar>(
+      new GroupedPermissionInfoBar(std::move(delegate)));
+}