| Index: chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopupLegacy.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopupLegacy.java b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopupLegacy.java
|
| deleted file mode 100644
|
| index 33fa70a02bb34174945d82d6117ea3fafd5da455..0000000000000000000000000000000000000000
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopupLegacy.java
|
| +++ /dev/null
|
| @@ -1,245 +0,0 @@
|
| -// 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;
|
| -import android.graphics.Color;
|
| -import android.provider.Browser;
|
| -import android.text.TextUtils;
|
| -import android.view.LayoutInflater;
|
| -import android.view.View;
|
| -import android.view.View.OnClickListener;
|
| -import android.view.ViewGroup;
|
| -import android.view.Window;
|
| -import android.widget.Button;
|
| -import android.widget.ImageView;
|
| -import android.widget.LinearLayout;
|
| -import android.widget.ScrollView;
|
| -import android.widget.TextView;
|
| -
|
| -import org.chromium.base.ApiCompatibilityUtils;
|
| -import org.chromium.base.CalledByNative;
|
| -import org.chromium.chrome.R;
|
| -import org.chromium.content.browser.WebContentsObserver;
|
| -import org.chromium.content_public.browser.WebContents;
|
| -
|
| -import java.net.URISyntaxException;
|
| -
|
| -/**
|
| - * Java side of Android implementation of the website settings UI.
|
| - */
|
| -public class WebsiteSettingsPopupLegacy implements OnClickListener {
|
| - 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 final long mNativeWebsiteSettingsPopupLegacy;
|
| - private TextView mCertificateViewer, mMoreInfoLink;
|
| - private ViewGroup mCertificateLayout, mDescriptionLayout;
|
| - private Button mResetCertDecisionsButton;
|
| - private String mLinkUrl;
|
| -
|
| - private WebsiteSettingsPopupLegacy(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.
|
| - mNativeWebsiteSettingsPopupLegacy = nativeInit(this, webContents);
|
| - final WebContentsObserver webContentsObserver =
|
| - new WebContentsObserver(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 mNativeWebsiteSettingsPopupLegacy != 0;
|
| - webContentsObserver.detachFromWebContents();
|
| - nativeDestroy(mNativeWebsiteSettingsPopupLegacy);
|
| - }
|
| - });
|
| - }
|
| -
|
| - /**
|
| - * 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,
|
| - String label) {
|
| - View section = addSection(enumeratedIconId, headline, description);
|
| - assert mCertificateLayout == null;
|
| - mCertificateLayout = (ViewGroup) section.findViewById(R.id.website_settings_text_layout);
|
| - if (label != null && !label.isEmpty()) {
|
| - setCertificateViewer(label);
|
| - }
|
| - }
|
| -
|
| - /**
|
| - * Adds Description section, which contains an icon, a headline, and a
|
| - * description. Most likely headline for description is empty
|
| - */
|
| - @CalledByNative
|
| - private void addDescriptionSection(int enumeratedIconId, String headline, String description) {
|
| - View section = addSection(enumeratedIconId, headline, description);
|
| - assert mDescriptionLayout == null;
|
| - mDescriptionLayout = (ViewGroup) section.findViewById(R.id.website_settings_text_layout);
|
| - }
|
| -
|
| - private View addSection(int enumeratedIconId, String headline, String description) {
|
| - View section = LayoutInflater.from(mContext).inflate(R.layout.website_settings_legacy,
|
| - null);
|
| - ImageView i = (ImageView) section.findViewById(R.id.website_settings_icon);
|
| - int drawableId = ResourceId.mapToDrawableId(enumeratedIconId);
|
| - i.setImageResource(drawableId);
|
| -
|
| - TextView h = (TextView) section.findViewById(R.id.website_settings_headline);
|
| - h.setText(headline);
|
| - if (TextUtils.isEmpty(headline)) h.setVisibility(View.GONE);
|
| -
|
| - TextView d = (TextView) section.findViewById(R.id.website_settings_description);
|
| - d.setText(description);
|
| - d.setTextSize(DESCRIPTION_TEXT_SIZE_SP);
|
| - if (TextUtils.isEmpty(description)) d.setVisibility(View.GONE);
|
| -
|
| - mContainer.addView(section);
|
| - return section;
|
| - }
|
| -
|
| - private void setCertificateViewer(String label) {
|
| - assert mCertificateViewer == null;
|
| - mCertificateViewer = new TextView(mContext);
|
| - 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 mNativeWebsiteSettingsPopupLegacy != 0;
|
| - assert mResetCertDecisionsButton == null;
|
| -
|
| - mResetCertDecisionsButton = new Button(mContext);
|
| - mResetCertDecisionsButton.setText(label);
|
| - ApiCompatibilityUtils.setBackgroundForView(mResetCertDecisionsButton,
|
| - mContext.getResources().getDrawable(
|
| - R.drawable.website_settings_reset_cert_decisions));
|
| - mResetCertDecisionsButton.setTextColor(
|
| - mContext.getResources().getColor(
|
| - R.color.website_settings_popup_reset_cert_decisions_button));
|
| - mResetCertDecisionsButton.setTextSize(DESCRIPTION_TEXT_SIZE_SP);
|
| - mResetCertDecisionsButton.setOnClickListener(this);
|
| -
|
| - LinearLayout container = new LinearLayout(mContext);
|
| - container.setOrientation(LinearLayout.VERTICAL);
|
| - container.addView(mResetCertDecisionsButton);
|
| - container.setPadding(0, 0, 0, mPaddingWide);
|
| - mContainer.addView(container);
|
| - }
|
| -
|
| - @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(
|
| - mContext.getResources().getColor(R.color.website_settings_popup_text_link));
|
| - mMoreInfoLink.setTextSize(DESCRIPTION_TEXT_SIZE_SP);
|
| - mMoreInfoLink.setPadding(0, mPaddingWide + mPaddingThin, 0, mPaddingWide);
|
| - mMoreInfoLink.setOnClickListener(this);
|
| - mDescriptionLayout.addView(mMoreInfoLink);
|
| - }
|
| -
|
| - /** Displays the WebsiteSettingsPopupLegacy. */
|
| - @CalledByNative
|
| - private void showDialog() {
|
| - ScrollView scrollView = new ScrollView(mContext);
|
| - scrollView.addView(mContainer);
|
| - mDialog.addContentView(scrollView,
|
| - new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
|
| - LinearLayout.LayoutParams.MATCH_PARENT));
|
| - mDialog.show();
|
| - }
|
| -
|
| - @Override
|
| - public void onClick(View v) {
|
| - mDialog.dismiss();
|
| - if (mResetCertDecisionsButton == v) {
|
| - nativeResetCertDecisions(mNativeWebsiteSettingsPopupLegacy, mWebContents);
|
| - } else if (mCertificateViewer == v) {
|
| - byte[][] certChain = nativeGetCertificateChain(mWebContents);
|
| - if (certChain == null) {
|
| - // The WebContents may have been destroyed/invalidated. If so,
|
| - // ignore this request.
|
| - 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) {
|
| - // Do nothing intentionally.
|
| - }
|
| - }
|
| - }
|
| -
|
| - /**
|
| - * 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 WebsiteSettingsPopupLegacy(context, webContents);
|
| - }
|
| -
|
| - private static native long nativeInit(WebsiteSettingsPopupLegacy popup,
|
| - WebContents webContents);
|
| - private native void nativeDestroy(long nativeWebsiteSettingsPopupLegacyAndroid);
|
| - private native void nativeResetCertDecisions(
|
| - long nativeWebsiteSettingsPopupLegacyAndroid, WebContents webContents);
|
| - private native byte[][] nativeGetCertificateChain(WebContents webContents);
|
| -}
|
|
|