chrome/browser/ui/webui/settings/md_settings_ui.cc - Issue 2076083003: MD Settings: ... and we fixed all CHECK()-based URL crashes once and for all.

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/webui/settings/md_settings_ui.cc

Issue 2076083003: MD Settings: ... and we fixed all CHECK()-based URL crashes once and for all. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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

« no previous file with comments | « chrome/browser/ui/webui/settings/md_settings_ui.h ('k') | chrome/browser/ui/webui/settings/md_settings_ui_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/settings/md_settings_ui.cc

diff --git a/chrome/browser/ui/webui/settings/md_settings_ui.cc b/chrome/browser/ui/webui/settings/md_settings_ui.cc

index b0b68764351090b08af0a51022d231f1f51b6c21..0cf77325aa5372e5f4fcdb74467fc60e5c5e2c17 100644

--- a/chrome/browser/ui/webui/settings/md_settings_ui.cc

+++ b/chrome/browser/ui/webui/settings/md_settings_ui.cc

@@ -53,7 +53,7 @@

namespace settings {

-MdSettingsUI::MdSettingsUI(content::WebUI* web_ui)

+MdSettingsUI::MdSettingsUI(content::WebUI* web_ui, const GURL& url)

: content::WebUIController(web_ui),

WebContentsObserver(web_ui->GetWebContents()) {

Profile* profile = Profile::FromWebUI(web_ui);

@@ -88,11 +88,6 @@ MdSettingsUI::MdSettingsUI(content::WebUI* web_ui)

// Host must be derived from the visible URL, since this might be serving

// either chrome://settings or chrome://md-settings.

- GURL url = web_ui->GetWebContents()->GetVisibleURL();

- if (url.SchemeIs(content::kViewSourceScheme))

- url = GURL(url.GetContent());

CHECK(url.GetOrigin() == GURL(chrome::kChromeUISettingsURL).GetOrigin() ||

michaelpg 2016/06/17 20:57:11 it would be nice if we could just crash the tab in

Dan Beam 2016/06/17 21:05:15 CHECK() is stuff that should never happen, so I do

url.GetOrigin() == GURL(chrome::kChromeUIMdSettingsURL).GetOrigin());