| Index: chrome/browser/ui/android/website_settings_popup_android.cc
|
| diff --git a/chrome/browser/ui/android/website_settings_popup_android.cc b/chrome/browser/ui/android/website_settings_popup_android.cc
|
| index e9cab3b4e706e27e06eba7a78c9d3c666b4ad18b..ca785ed0ba8a1bfbbb13f1e51814f6095dcce879 100644
|
| --- a/chrome/browser/ui/android/website_settings_popup_android.cc
|
| +++ b/chrome/browser/ui/android/website_settings_popup_android.cc
|
| @@ -64,14 +64,16 @@ WebsiteSettingsPopupAndroid::WebsiteSettingsPopupAndroid(
|
|
|
| WebsiteSettingsPopupAndroid::~WebsiteSettingsPopupAndroid() {}
|
|
|
| -void WebsiteSettingsPopupAndroid::Destroy(JNIEnv* env, jobject obj) {
|
| +void WebsiteSettingsPopupAndroid::Destroy(JNIEnv* env,
|
| + const JavaParamRef<jobject>& obj) {
|
| delete this;
|
| }
|
|
|
| -void WebsiteSettingsPopupAndroid::OnPermissionSettingChanged(JNIEnv* env,
|
| - jobject obj,
|
| - jint type,
|
| - jint setting) {
|
| +void WebsiteSettingsPopupAndroid::OnPermissionSettingChanged(
|
| + JNIEnv* env,
|
| + const JavaParamRef<jobject>& obj,
|
| + jint type,
|
| + jint setting) {
|
| ContentSettingsType content_setting_type =
|
| static_cast<ContentSettingsType>(type);
|
| ContentSetting content_setting = static_cast<ContentSetting>(setting);
|
|
|