Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3310)

Unified Diff: chrome/browser/ui/android/infobars/permission_group_infobar_android.cc

Issue 1332063003: permissions: implement coalesced permissions on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@request-multiple
Patch Set: Fix layout to be closer to mock + switch infobar title Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/android/infobars/permission_group_infobar_android.cc
diff --git a/chrome/browser/ui/android/infobars/permission_group_infobar_android.cc b/chrome/browser/ui/android/infobars/permission_group_infobar_android.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d69252bbd29c41827fd41ec975eea6bbda9b4511
--- /dev/null
+++ b/chrome/browser/ui/android/infobars/permission_group_infobar_android.cc
@@ -0,0 +1,138 @@
+// Copyright 2015 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/permission_group_infobar_android.h"
+
+#include "base/android/jni_android.h"
+#include "base/android/jni_array.h"
+#include "base/android/jni_string.h"
+#include "base/android/scoped_java_ref.h"
+#include "chrome/browser/android/permissions/permission_group_infobar_delegate_android.h"
+#include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/grit/generated_resources.h"
+#include "content/public/browser/android/content_view_core.h"
+#include "content/public/browser/web_contents.h"
+#include "jni/PermissionGroupInfoBarAndroid_jni.h"
+#include "ui/android/window_android.h"
+#include "ui/base/l10n/l10n_util.h"
+
+namespace {
+
+std::string GetPermissionMessage(ContentSettingsType type) {
+ int message_id;
+ switch (type) {
+ case ContentSettingsType::CONTENT_SETTINGS_TYPE_GEOLOCATION:
+ message_id = IDS_GEOLOCATION_INFOBAR_PERMISSION_FRAGMENT;
+ break;
+ case ContentSettingsType::CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
+ message_id = IDS_NOTIFICATION_PERMISSIONS_FRAGMENT;
+ break;
+ case ContentSettingsType::CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
+ message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT;
+ break;
+ case ContentSettingsType::CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
+ NOTREACHED();
gone 2015/09/25 16:43:52 are all of these NOTREACHED() still necessary?
Lalit Maganti 2015/09/28 09:24:02 Not really. I'll just removed them and collapse in
gone 2015/09/28 10:48:43 Should be explicit when listing these out. I thin
+ message_id = IDS_NOTIFICATION_PERMISSIONS_FRAGMENT;
+ break;
+ case ContentSettingsType::CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
+ NOTREACHED();
+ message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT;
+ break;
+ case ContentSettingsType::CONTENT_SETTINGS_TYPE_DURABLE_STORAGE:
+ NOTREACHED();
+ message_id = IDS_DURABLE_STORAGE_BUBBLE_FRAGMENT;
+ break;
+ case ContentSettingsType::CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
+ NOTREACHED();
+ message_id = IDS_MEDIA_CAPTURE_AUDIO_ONLY_PERMISSION_FRAGMENT;
+ break;
+ case ContentSettingsType::CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
+ NOTREACHED();
+ message_id = IDS_MEDIA_CAPTURE_VIDEO_ONLY_PERMISSION_FRAGMENT;
+ break;
+ default:
+ NOTREACHED();
+ message_id = IDS_GEOLOCATION_INFOBAR_PERMISSION_FRAGMENT;
+ break;
+ }
+ return l10n_util::GetStringUTF8(message_id);
+}
+
+} // anonymous namespace
+
+PermissionGroupInfoBarAndroid::PermissionGroupInfoBarAndroid(
+ scoped_ptr<PermissionGroupInfoBarDelegateAndroid> delegate,
+ std::vector<int> permission_types)
+ : ConfirmInfoBar(delegate.Pass()),
+ permission_types_(permission_types) {
+}
+
+PermissionGroupInfoBarAndroid::~PermissionGroupInfoBarAndroid() {
+ if (java_infobar_.is_null())
+ return;
+
+ JNIEnv* env = base::android::AttachCurrentThread();
+ Java_PermissionGroupInfoBarAndroid_onNativeDestroyed(
+ env, java_infobar_.obj());
+ java_infobar_.Reset();
+}
+
+PermissionGroupInfoBarDelegateAndroid*
+PermissionGroupInfoBarAndroid::GetDelegate() {
+ return static_cast<PermissionGroupInfoBarDelegateAndroid*>(delegate());
+}
+
+void PermissionGroupInfoBarAndroid::OnCheckedStateUpdate(
+ JNIEnv* env,
+ jobject obj,
+ jbooleanArray raw_checked_states) {
+ jint array_size = env->GetArrayLength(raw_checked_states);
+ jboolean* states_ptr = env->GetBooleanArrayElements(
+ raw_checked_states, NULL);
+
+ GetDelegate()->OnCheckedStateUpdate(states_ptr, array_size);
+}
+
+base::android::ScopedJavaLocalRef<jobject>
+PermissionGroupInfoBarAndroid::CreateRenderInfoBar(JNIEnv* env) {
+ content::WebContents* web_contents =
+ InfoBarService::WebContentsFromInfoBar(this);
+ DCHECK(web_contents);
+ content::ContentViewCore* cvc =
+ content::ContentViewCore::FromWebContents(web_contents);
+ DCHECK(cvc);
+
+ // Convert the types to their string representations.
+ std::vector<std::string> permission_messages;
+ for (int permission : permission_types_) {
+ permission_messages.push_back(
+ GetPermissionMessage(static_cast<ContentSettingsType>(permission)));
+ }
+
+ base::android::ScopedJavaLocalRef<jobject> jwindow_android =
+ cvc->GetWindowAndroid()->GetJavaObject();
+ base::android::ScopedJavaLocalRef<jstring> jtitle_message =
+ base::android::ConvertUTF16ToJavaString(
+ env, GetDelegate()->GetMessageText());
+ base::android::ScopedJavaLocalRef<jobjectArray> jpermission_messages =
+ base::android::ToJavaArrayOfStrings(env, permission_messages);
+ base::android::ScopedJavaLocalRef<jintArray> jtypes =
+ base::android::ToJavaIntArray(env, permission_types_);
+
+ base::android::ScopedJavaLocalRef<jobject> infobar;
+ infobar.Reset(Java_PermissionGroupInfoBarAndroid_createInfoBar(env,
+ reinterpret_cast<intptr_t>(this),
+ jwindow_android.obj(),
+ jtitle_message.obj(),
+ jpermission_messages.obj(),
+ jtypes.obj()));
+ java_infobar_.Reset(env, infobar.obj());
+ return infobar;
+}
+
+// Native JNI methods ---------------------------------------------------------
+
+bool RegisterPermissionGroupInfoBarAndroid(JNIEnv* env) {
+ return RegisterNativesImpl(env);
+}

Powered by Google App Engine
This is Rietveld 408576698