Commit 635e85a9 authored by Raymes Khoury's avatar Raymes Khoury Committed by Commit Bot

Revert "Remove DSE text from Page Info in incognito"

This reverts commit c8b47bac.

Reason for revert: This caused a regression: https://bugs.chromium.org/p/chromium/issues/detail?id=807898

Original change's description:
> Remove DSE text from Page Info in incognito
> 
> Currently we still display the text "Location - Blocked for current search
> engine" in Page Info when in incognito mode. However, in reality, DSE
> settings don't impact incognito mode so we should just display the same
> thing in Page Info as we do for a regular website.
> 
> Change-Id: I0dc820f888945adb4288c1aec65f2c3d726f252f
> Reviewed-on: https://chromium-review.googlesource.com/885382
> Reviewed-by: Ted Choc <tedchoc@chromium.org>
> Reviewed-by: Ben Wells <benwells@chromium.org>
> Commit-Queue: Raymes Khoury <raymes@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#532292}

TBR=raymes@chromium.org,benwells@chromium.org,tedchoc@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: Ibf27584954e10f3173e2424aa52411269daf1784
Reviewed-on: https://chromium-review.googlesource.com/899685Reviewed-by: default avatarRaymes Khoury <raymes@chromium.org>
Commit-Queue: Raymes Khoury <raymes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#534101}
parent 8754b1f6
...@@ -676,8 +676,7 @@ public class PageInfoPopup implements OnClickListener { ...@@ -676,8 +676,7 @@ public class PageInfoPopup implements OnClickListener {
assert false : "Invalid setting " + permission.setting + " for permission " assert false : "Invalid setting " + permission.setting + " for permission "
+ permission.type; + permission.type;
} }
if (WebsitePreferenceBridge.isPermissionControlledByDSE( if (WebsitePreferenceBridge.isPermissionControlledByDSE(permission.type, mFullUrl, false)) {
permission.type, mFullUrl, mTab.isIncognito())) {
status_text = statusTextForDSEPermission(permission); status_text = statusTextForDSEPermission(permission);
} }
builder.append(status_text); builder.append(status_text);
......
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