chrome/browser/chrome_content_browser_client.cc - Issue 7068007: Revise about: and chrome: url handling.

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/chrome_content_browser_client.cc

Issue 7068007: Revise about: and chrome: url handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix nits from codereview.chromium.org/7104022/. Created 9 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:

Index: chrome/browser/chrome_content_browser_client.cc

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc

index 692f406373fb0a9160b437294bc89d40312c4b76..1ad00b6870af2c284c734c983c3bb53dc6499661 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -182,9 +182,10 @@ GURL ChromeContentBrowserClient::GetEffectiveURL(Profile* profile,

}

bool ChromeContentBrowserClient::IsURLSameAsAnySiteInstance(const GURL& url) {

- return url.spec() == chrome::kAboutKillURL ||

- url.spec() == chrome::kAboutHangURL ||

- url.spec() == chrome::kAboutShorthangURL;

+ return url == GURL(chrome::kChromeUICrashURL) ||

+ url == GURL(chrome::kChromeUIKillURL) ||

+ url == GURL(chrome::kChromeUIHangURL) ||

+ url == GURL(chrome::kChromeUIShorthangURL);

}

std::string ChromeContentBrowserClient::GetCanonicalEncodingNameByAliasName(