| Index: chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java b/chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java
|
| index e1d39ceac5077d954e60f02715d9aa8ab94b0e2d..99412beed593f0da9a018a8eaa933cc5e3e35ac1 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java
|
| @@ -229,7 +229,7 @@ public class WebsiteSettingsPopup implements OnClickListener {
|
| private final WindowAndroid mWindowAndroid;
|
|
|
| // A pointer to the C++ object for this UI.
|
| - private final long mNativeWebsiteSettingsPopup;
|
| + private long mNativeWebsiteSettingsPopup;
|
|
|
| // The outer container, filled with the layout from website_settings.xml.
|
| private final LinearLayout mContainer;
|
| @@ -397,6 +397,7 @@ public class WebsiteSettingsPopup implements OnClickListener {
|
| assert mNativeWebsiteSettingsPopup != 0;
|
| webContentsObserver.destroy();
|
| nativeDestroy(mNativeWebsiteSettingsPopup);
|
| + mNativeWebsiteSettingsPopup = 0;
|
| }
|
| });
|
|
|
| @@ -875,7 +876,9 @@ public class WebsiteSettingsPopup implements OnClickListener {
|
| }
|
|
|
| private void recordAction(int action) {
|
| - nativeRecordWebsiteSettingsAction(mNativeWebsiteSettingsPopup, action);
|
| + if (mNativeWebsiteSettingsPopup != 0) {
|
| + nativeRecordWebsiteSettingsAction(mNativeWebsiteSettingsPopup, action);
|
| + }
|
| }
|
|
|
| /**
|
|
|