chrome/browser/ui/website_settings/website_settings.cc - Issue 620983002: Add Permissions to the PageInfo dialog on Android

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/website_settings/website_settings.cc

Issue 620983002: Add Permissions to the PageInfo dialog on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@page_info_dialog_shell_only_v2

Patch Set: Final rebase Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java ('K') | « chrome/browser/ui/android/website_settings_popup_android.cc ('k') | chrome/browser/ui/website_settings/website_settings_ui.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/website_settings/website_settings.cc

diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc

index 632bff3e50d1f8affdb2df724c49cdc7ff8dfa8f..f19d2b0c32d7377af28621cf8e011910d477b608 100644

--- a/chrome/browser/ui/website_settings/website_settings.cc

+++ b/chrome/browser/ui/website_settings/website_settings.cc

@@ -337,7 +337,13 @@ void WebsiteSettings::OnRevokeSSLErrorBypassButtonPressed() {

void WebsiteSettings::Init(Profile* profile,

const GURL& url,

const content::SSLStatus& ssl) {

- if (url.SchemeIs(content::kChromeUIScheme)) {

+ bool isChromeUINativeScheme = false;

+#if defined(OS_ANDROID)

+ isChromeUINativeScheme = url.SchemeIs(chrome::kChromeUINativeScheme);

+#endif

+ if (url.SchemeIs(content::kChromeUIScheme) ||

+ url.SchemeIs(url::kAboutScheme) || isChromeUINativeScheme) {

site_identity_status_ = SITE_IDENTITY_STATUS_INTERNAL_PAGE;

site_identity_details_ =

l10n_util::GetStringUTF16(IDS_PAGE_INFO_INTERNAL_PAGE);