Chromium Code Reviews| 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 |
| index 8f3065532a50d09f84d1b1780eb927f965948b60..5c8afd1db2543e749a7ea43b567fdfc596df7492 100644 |
| --- a/chrome/browser/ui/android/infobars/grouped_permission_infobar.cc |
| +++ b/chrome/browser/ui/android/infobars/grouped_permission_infobar.cc |
| @@ -8,7 +8,7 @@ |
| #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 "chrome/browser/permissions/grouped_permission_infobar_delegate_android.h" |
| #include "jni/GroupedPermissionInfoBar_jni.h" |
| GroupedPermissionInfoBar::GroupedPermissionInfoBar( |
| @@ -26,11 +26,10 @@ void GroupedPermissionInfoBar::SetPermissionState( |
| JNIEnv* env, |
| const base::android::JavaParamRef<jobject>& obj, |
| const base::android::JavaParamRef<jbooleanArray>& permissions) { |
| - |
| - for (int i = 0; i < GetDelegate()->GetPermissionCount(); i++) { |
| - jboolean value; |
| - env->GetBooleanArrayRegion(permissions.obj(), i, 1, &value); |
| - GetDelegate()->ToggleAccept(i, value); |
| + for (size_t i = 0; i < GetDelegate()->permission_count(); i++) { |
| + jboolean value; |
| + env->GetBooleanArrayRegion(permissions.obj(), i, 1, &value); |
| + GetDelegate()->ToggleAccept(i, value); |
| } |
|
Peter Kasting
2016/09/23 00:42:06
Nit: Longer-term consideration: Is this the only p
lshang
2016/09/27 01:50:43
This is for future work. We're planning to reuse P
|
| } |
| @@ -64,7 +63,7 @@ GroupedPermissionInfoBar::CreateRenderInfoBar(JNIEnv* env) { |
| std::vector<int> permission_icons; |
| std::vector<int> content_settings_types; |
| - for (int i = 0; i < delegate->GetPermissionCount(); i++) { |
| + for (size_t i = 0; i < delegate->permission_count(); i++) { |
| permission_strings.push_back(delegate->GetMessageTextFragment(i)); |
| permission_icons.push_back( |
| ResourceMapper::MapFromChromiumId(delegate->GetIconIdForPermission(i))); |
| @@ -91,11 +90,3 @@ void GroupedPermissionInfoBar::SetJavaInfoBar( |
| GroupedPermissionInfoBarDelegate* GroupedPermissionInfoBar::GetDelegate() { |
| return static_cast<GroupedPermissionInfoBarDelegate*>(delegate()); |
| } |
| - |
| -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))); |
| -} |