Allow modal permission prompts on Android to request system permissions.

chrome/browser/permissions/permission_dialog_delegate.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/permission_dialog_delegate.h"
 
 #include <utility>
 
 #include "base/android/jni_android.h"
+#include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/feature_list.h"
 #include "build/build_config.h"
 #include "chrome/browser/android/resource_mapper.h"
+#include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/geolocation/geolocation_infobar_delegate_android.h"
 #include "chrome/browser/media/midi_permission_infobar_delegate_android.h"
 #include "chrome/browser/media/protected_media_identifier_infobar_delegate_android.h"
 #include "chrome/browser/media/webrtc/media_stream_devices_controller.h"
 #include "chrome/browser/media/webrtc/media_stream_infobar_delegate_android.h"
 #include "chrome/browser/notifications/notification_permission_infobar_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_features.h"
 #include "components/variations/variations_associated_data.h"
-#include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/PermissionDialogController_jni.h"
 #include "jni/PermissionDialogDelegate_jni.h"
 #include "ui/android/window_android.h"
 #include "ui/base/window_open_disposition.h"
 
 using base::android::ConvertUTF16ToJavaString;
 
 namespace {
 
@@ skipping 47 matching lines @@
   return has_user_gesture;
 }
 
 // static
 bool PermissionDialogDelegate::RegisterPermissionDialogDelegate(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 ScopedJavaLocalRef<jobject> PermissionDialogDelegate::CreateJavaDelegate(
     JNIEnv* env) {
-  content::ContentViewCore* cvc =
-      content::ContentViewCore::FromWebContents(web_contents());
-  DCHECK(cvc);
+  TabAndroid* tab = TabAndroid::FromWebContents(web_contents());
+  DCHECK(tab);
+
+  std::vector<int> content_settings{infobar_delegate_->content_settings()};
 
   return Java_PermissionDialogDelegate_create(
       env, reinterpret_cast<uintptr_t>(this),
-      cvc->GetWindowAndroid()->GetJavaObject(),
+      tab->GetJavaObject(),
+      base::android::ToJavaIntArray(env, content_settings).obj(),
       ResourceMapper::MapFromChromiumId(infobar_delegate_->GetIconId()),
       ConvertUTF16ToJavaString(env, infobar_delegate_->GetMessageText()),
       ConvertUTF16ToJavaString(env, infobar_delegate_->GetLinkText()),
       ConvertUTF16ToJavaString(env, infobar_delegate_->GetButtonLabel(
                                         PermissionInfoBarDelegate::BUTTON_OK)),
       ConvertUTF16ToJavaString(env,
                                infobar_delegate_->GetButtonLabel(
                                    PermissionInfoBarDelegate::BUTTON_CANCEL)),
       infobar_delegate_->ShouldShowPersistenceToggle());
 }
@@ skipping 49 matching lines @@
   base::android::ScopedJavaLocalRef<jobject> j_delegate =
       CreateJavaDelegate(env);
 
   // Send the Java delegate to the Java PermissionDialogController for display.
   // The controller takes over lifetime management; when the Java delegate is no
   // longer needed it will in turn free the native delegate.
   Java_PermissionDialogController_createDialog(env, j_delegate.obj());
 }
 
 PermissionDialogDelegate::~PermissionDialogDelegate() {}