Commit db6350da authored by Mugdha Lakhani's avatar Mugdha Lakhani Committed by Commit Bot

[WebLayer] Remove PageInfoController's SiteSettingsHelper dependency.

SiteSettingsHelper is implemented in //chrome. This removes the
dependency of PageInfoController on this class so it can be
componentized.

Bug: 1052375
Change-Id: I0a80f93d0314a2202e4f3c77a55731759516caf0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2152368
Commit-Queue: Mugdha Lakhani <nator@chromium.org>
Reviewed-by: default avatarColin Blundell <blundell@chromium.org>
Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759762}
parent 5dd1d8e7
...@@ -300,6 +300,22 @@ public class ChromePageInfoControllerDelegate implements PageInfoControllerDeleg ...@@ -300,6 +300,22 @@ public class ChromePageInfoControllerDelegate implements PageInfoControllerDeleg
return null; return null;
} }
/**
* {@inheritDoc}
*/
@Override
public boolean isSiteSettingsAvailable() {
return SiteSettingsHelper.isSiteSettingsAvailable(mWebContents);
}
/**
* {@inheritDoc}
*/
@Override
public void showSiteSettings(String url) {
SiteSettingsHelper.showSiteSettings(mActivity, url);
}
@VisibleForTesting @VisibleForTesting
void setOfflinePageStateForTesting(@OfflinePageState int offlinePageState) { void setOfflinePageStateForTesting(@OfflinePageState int offlinePageState) {
mOfflinePageState = offlinePageState; mOfflinePageState = offlinePageState;
......
...@@ -195,12 +195,12 @@ public class PageInfoController implements ModalDialogProperties.Controller, ...@@ -195,12 +195,12 @@ public class PageInfoController implements ModalDialogProperties.Controller,
displayUrlBuilder.toString(), autocompleteSchemeClassifier); displayUrlBuilder.toString(), autocompleteSchemeClassifier);
autocompleteSchemeClassifier.destroy(); autocompleteSchemeClassifier.destroy();
if (SiteSettingsHelper.isSiteSettingsAvailable(webContents)) { if (mDelegate.isSiteSettingsAvailable()) {
viewParams.siteSettingsButtonClickCallback = () -> { viewParams.siteSettingsButtonClickCallback = () -> {
// Delay while the dialog closes. // Delay while the dialog closes.
runAfterDismiss(() -> { runAfterDismiss(() -> {
recordAction(PageInfoAction.PAGE_INFO_SITE_SETTINGS_OPENED); recordAction(PageInfoAction.PAGE_INFO_SITE_SETTINGS_OPENED);
SiteSettingsHelper.showSiteSettings(activity, mFullUrl); mDelegate.showSiteSettings(mFullUrl);
}); });
}; };
viewParams.cookieControlsShown = delegate.cookieControlsShown(); viewParams.cookieControlsShown = delegate.cookieControlsShown();
......
...@@ -93,4 +93,15 @@ public interface PageInfoControllerDelegate { ...@@ -93,4 +93,15 @@ public interface PageInfoControllerDelegate {
*/ */
@Nullable @Nullable
String getOfflinePageConnectionMessage(); String getOfflinePageConnectionMessage();
/**
* Whether Site settings are available.
*/
boolean isSiteSettingsAvailable();
/**
* Show site settings for the URL passed in.
* @param url The URL to show site settings for.
*/
void showSiteSettings(String url);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment