| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/android/infobars/grouped_permission_infobar.h" | 5 #include "chrome/browser/ui/android/infobars/grouped_permission_infobar.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_array.h" | 8 #include "base/android/jni_array.h" |
| 9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
| 10 #include "chrome/browser/android/resource_mapper.h" | 10 #include "chrome/browser/android/resource_mapper.h" |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 std::vector<int> content_settings_types; | 53 std::vector<int> content_settings_types; |
| 54 | 54 |
| 55 for (int i = 0; i < delegate->GetPermissionCount(); i++) { | 55 for (int i = 0; i < delegate->GetPermissionCount(); i++) { |
| 56 permission_strings.push_back(delegate->GetMessageTextFragment(i)); | 56 permission_strings.push_back(delegate->GetMessageTextFragment(i)); |
| 57 permission_icons.push_back( | 57 permission_icons.push_back( |
| 58 ResourceMapper::MapFromChromiumId(delegate->GetIconIdForPermission(i))); | 58 ResourceMapper::MapFromChromiumId(delegate->GetIconIdForPermission(i))); |
| 59 content_settings_types.push_back(delegate->GetContentSettingType(i)); | 59 content_settings_types.push_back(delegate->GetContentSettingType(i)); |
| 60 } | 60 } |
| 61 | 61 |
| 62 return Java_GroupedPermissionInfoBar_create( | 62 return Java_GroupedPermissionInfoBar_create( |
| 63 env, message_text.obj(), ok_button_text.obj(), cancel_button_text.obj(), | 63 env, message_text, ok_button_text, cancel_button_text, |
| 64 base::android::ToJavaIntArray(env, permission_icons).obj(), | 64 base::android::ToJavaIntArray(env, permission_icons), |
| 65 base::android::ToJavaArrayOfStrings(env, permission_strings).obj(), | 65 base::android::ToJavaArrayOfStrings(env, permission_strings), |
| 66 GetWindowAndroid().obj(), | 66 GetWindowAndroid(), |
| 67 base::android::ToJavaIntArray(env, content_settings_types).obj()); | 67 base::android::ToJavaIntArray(env, content_settings_types)); |
| 68 } | 68 } |
| 69 | 69 |
| 70 void GroupedPermissionInfoBar::SetJavaInfoBar( | 70 void GroupedPermissionInfoBar::SetJavaInfoBar( |
| 71 const base::android::JavaRef<jobject>& java_info_bar) { | 71 const base::android::JavaRef<jobject>& java_info_bar) { |
| 72 InfoBarAndroid::SetJavaInfoBar(java_info_bar); | 72 InfoBarAndroid::SetJavaInfoBar(java_info_bar); |
| 73 JNIEnv* env = base::android::AttachCurrentThread(); | 73 JNIEnv* env = base::android::AttachCurrentThread(); |
| 74 Java_GroupedPermissionInfoBar_setNativePtr(env, java_info_bar.obj(), | 74 Java_GroupedPermissionInfoBar_setNativePtr(env, java_info_bar, |
| 75 reinterpret_cast<intptr_t>(this)); | 75 reinterpret_cast<intptr_t>(this)); |
| 76 } | 76 } |
| 77 | 77 |
| 78 GroupedPermissionInfoBarDelegate* GroupedPermissionInfoBar::GetDelegate() { | 78 GroupedPermissionInfoBarDelegate* GroupedPermissionInfoBar::GetDelegate() { |
| 79 return static_cast<GroupedPermissionInfoBarDelegate*>(delegate()); | 79 return static_cast<GroupedPermissionInfoBarDelegate*>(delegate()); |
| 80 } | 80 } |
| 81 | 81 |
| 82 std::unique_ptr<infobars::InfoBar> | 82 std::unique_ptr<infobars::InfoBar> |
| 83 GroupedPermissionInfoBarDelegate::CreateInfoBar( | 83 GroupedPermissionInfoBarDelegate::CreateInfoBar( |
| 84 infobars::InfoBarManager* infobar_manager, | 84 infobars::InfoBarManager* infobar_manager, |
| 85 std::unique_ptr<GroupedPermissionInfoBarDelegate> delegate) { | 85 std::unique_ptr<GroupedPermissionInfoBarDelegate> delegate) { |
| 86 return std::unique_ptr<infobars::InfoBar>( | 86 return std::unique_ptr<infobars::InfoBar>( |
| 87 new GroupedPermissionInfoBar(std::move(delegate))); | 87 new GroupedPermissionInfoBar(std::move(delegate))); |
| 88 } | 88 } |
| OLD | NEW |