Add button to page info to revoke user certificate decisions.

chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

 // Copyright 2013 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.
 
 package org.chromium.chrome.browser;
 
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ skipping 24 matching lines @@
     private static final String HELP_URL =
             "http://www.google.com/support/chrome/bin/answer.py?answer=95617";
     private static final int DESCRIPTION_TEXT_SIZE_SP = 12;
     private final Context mContext;
     private final Dialog mDialog;
     private final LinearLayout mContainer;
     private final WebContents mWebContents;
     private final int mPaddingWide, mPaddingThin;
     private TextView mCertificateViewer, mMoreInfoLink;
     private ViewGroup mCertificateLayout, mDescriptionLayout;
+    private TextView mResetCertDecisions;
     private String mLinkUrl;
+    private final long mNativeWebsiteSettingsPopup;

[Ted C, 2014/07/28 20:15:49]

I would move this up with the other final fields.

[jww, 2014/08/06 00:51:47]

Done.

 
     private WebsiteSettingsPopup(Context context, WebContents webContents) {
         mContext = context;
         mWebContents = webContents;
 
         mContainer = new LinearLayout(mContext);
         mContainer.setOrientation(LinearLayout.VERTICAL);
         mContainer.setBackgroundColor(Color.WHITE);
         mPaddingWide = (int) context.getResources().getDimension(
                 R.dimen.certificate_viewer_padding_wide);
         mPaddingThin = (int) context.getResources().getDimension(
                 R.dimen.certificate_viewer_padding_thin);
         mContainer.setPadding(mPaddingWide, mPaddingWide + mPaddingThin, mPaddingWide,
                 mPaddingWide);
 
         mDialog = new Dialog(mContext);
         mDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         mDialog.setCanceledOnTouchOutside(true);
         // This needs to come after other member initialization.
-        final long nativeWebsiteSettingsPopup = nativeInit(this, webContents);
+        mNativeWebsiteSettingsPopup = nativeInit(this, webContents);
         final WebContentsObserverAndroid webContentsObserver =
                 new WebContentsObserverAndroid(mWebContents) {
             @Override
             public void navigationEntryCommitted() {
                 // If a navigation is committed (e.g. from in-page redirect), the data we're
                 // showing is stale so dismiss the dialog.
                 mDialog.dismiss();
             }
         };
         mDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
             @Override
             public void onDismiss(DialogInterface dialog) {
-                assert nativeWebsiteSettingsPopup != 0;
+                assert mNativeWebsiteSettingsPopup != 0;
                 webContentsObserver.detachFromWebContents();
-                nativeDestroy(nativeWebsiteSettingsPopup);
+                nativeDestroy(mNativeWebsiteSettingsPopup);
             }
         });
     }
 
     /**
      * Adds certificate section, which contains an icon, a headline, a
      * description and a label for certificate info link.
      */
     @CalledByNative
     private void addCertificateSection(int enumeratedIconId, String headline, String description,
@@ skipping 42 matching lines @@
         mCertificateViewer.setText(label);
         mCertificateViewer.setTextColor(
                 mContext.getResources().getColor(R.color.website_settings_popup_text_link));
         mCertificateViewer.setTextSize(DESCRIPTION_TEXT_SIZE_SP);
         mCertificateViewer.setOnClickListener(this);
         mCertificateViewer.setPadding(0, mPaddingWide, 0, mPaddingWide);
         mCertificateLayout.addView(mCertificateViewer);
     }
 
     @CalledByNative
+    private void addResetCertDecisionsButton(String label) {
+        assert mNativeWebsiteSettingsPopup != 0;
+        assert mResetCertDecisions == null;
+        mResetCertDecisions = new TextView(mContext);
+        mResetCertDecisions.setText(label);
+        mResetCertDecisions.setTextColor(
+                mContext.getResources().getColor(R.color.website_settings_popup_text_link));
+        mResetCertDecisions.setTextSize(DESCRIPTION_TEXT_SIZE_SP);
+        mResetCertDecisions.setOnClickListener(this);
+        mResetCertDecisions.setPadding(0, 0, 0, mPaddingWide);
+        mCertificateLayout.addView(mResetCertDecisions);

[Ted C, 2014/07/28 20:15:50]

I find it kind of odd that this is a text view that takes a "destructive" action
where the other links in this dialog are just taking you to some other page.

But this looks to be the same general idea as the other platforms, so I guess
this is fine.

[jww, 2014/08/06 00:51:47]

As per pkasting's comment, I've changed these all to buttons.

+    }
+
+    @CalledByNative
     private void addMoreInfoLink(String linkText) {
         addUrl(linkText, HELP_URL);
     }
 
     /** Adds a section containing a description and a hyperlink. */
     private void addUrl(String label, String url) {
         mMoreInfoLink = new TextView(mContext);
         mLinkUrl = url;
         mMoreInfoLink.setText(label);
         mMoreInfoLink.setTextColor(
@@ skipping 26 matching lines @@
                 return;
             }
             CertificateViewer.showCertificateChain(mContext, certChain);
         } else if (mMoreInfoLink == v) {
             try {
                 Intent i = Intent.parseUri(mLinkUrl, Intent.URI_INTENT_SCHEME);
                 i.putExtra(Browser.EXTRA_CREATE_NEW_TAB, true);
                 i.putExtra(Browser.EXTRA_APPLICATION_ID, mContext.getPackageName());
                 mContext.startActivity(i);
             } catch (URISyntaxException ex) {}
+        } else if (mResetCertDecisions == v) {
+          nativeResetCertDecisions(mNativeWebsiteSettingsPopup, mWebContents);

[Ted C, 2014/07/28 20:15:49]

+2 indent since you're in java land

[jww, 2014/08/06 00:51:47]

Done.

         }
     }
 
     /**
      * Shows a WebsiteSettings dialog for the provided WebContents.
      *
      * The popup adds itself to the view hierarchy which owns the reference while it's
      * visible.
      *
      * @param context Context which is used for launching a dialog.
      * @param webContents The WebContents for which to show Website information. This
      *         information is retrieved for the visible entry.
      */
     @SuppressWarnings("unused")
     public static void show(Context context, WebContents webContents) {
         new WebsiteSettingsPopup(context, webContents);
     }
 
     private static native long nativeInit(WebsiteSettingsPopup popup, WebContents webContents);
     private native void nativeDestroy(long nativeWebsiteSettingsPopupAndroid);
+    private native void nativeResetCertDecisions(long nativeWebsiteSettingsPopupAndroid, WebContents webContents);

[Ted C, 2014/07/28 20:15:49]

line length limit in java is 100, so you need to wrap these params.

[jww, 2014/08/06 00:51:47]

Done.

     private native byte[][] nativeGetCertificateChain(WebContents webContents);
-}
+}