Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(498)

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

Issue 2397273002: Show a custom page info bubble for chrome-devtools:// URLs (Closed)
Patch Set: Fix mac build Created 4 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
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 914ce96d88e626900c329b620da2c5a75a58689a..bf44bbf8b40cc416a381b5a442b218579754b30c 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -399,6 +399,12 @@ void WebsiteSettings::Init(
bool isChromeUINativeScheme = false;
#if BUILDFLAG(ANDROID_JAVA_UI)
isChromeUINativeScheme = url.SchemeIs(chrome::kChromeUINativeScheme);
+#else
+ // On desktop, internal URLs are displayed in a different UI and not here.
elawrence 2016/10/07 21:04:01 Is "desktop" mutually exclusive with "ANDROID_JAVA
meacer 2016/10/10 18:09:19 Ah, ANDROID_JAVA_UI really confused me. I thought
+ DCHECK(!url.SchemeIs(content::kChromeUIScheme) &&
+ !url.SchemeIs(content::kChromeDevToolsScheme) &&
+ !url.SchemeIs(content::kViewSourceScheme) &&
+ !url.SchemeIs(content_settings::kExtensionScheme));
#endif
if (url.SchemeIs(url::kAboutScheme)) {
@@ -414,7 +420,7 @@ void WebsiteSettings::Init(
return;
}
- if (url.SchemeIs(content::kChromeUIScheme) || isChromeUINativeScheme) {
+ if (isChromeUINativeScheme) {
elawrence 2016/10/07 21:04:01 I'm not sure I understand this change. Is this:
meacer 2016/10/10 18:09:19 I was being overly aggressive here, reverted this
site_identity_status_ = SITE_IDENTITY_STATUS_INTERNAL_PAGE;
site_identity_details_ =
l10n_util::GetStringUTF16(IDS_PAGE_INFO_INTERNAL_PAGE);

Powered by Google App Engine
This is Rietveld 408576698