summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-23 09:41:16 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-23 09:41:16 +0000
commit4d3b1f2b151c85e680beee462dacb1d75d72f5d2 (patch)
tree1b7c49006109958f5385542a276986a86823c336
parent52375cfbfe5d3a24d071d9d72fb7ba54b53ea4ca (diff)
downloadchromium_src-4d3b1f2b151c85e680beee462dacb1d75d72f5d2.zip
chromium_src-4d3b1f2b151c85e680beee462dacb1d75d72f5d2.tar.gz
chromium_src-4d3b1f2b151c85e680beee462dacb1d75d72f5d2.tar.bz2
Fix browser crash when typing chrome://extensions in an incognito window.
BUG=97505 TEST=See bug, it has repro steps that work. Review URL: http://codereview.chromium.org/7989010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102469 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/browser_navigator.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
index 78d0f9f..058be51 100644
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -64,13 +64,16 @@ bool CompareURLsWithReplacements(
}
// Change some of the navigation parameters based on the particular URL.
-// Currently this applies to chrome://settings and the bookmark manager,
-// which we always want to open in a normal (not incognito) window. Guest
-// session is an exception.
+// Currently this applies to chrome://settings, the bookmark manager,
+// and chrome://extensions, which we always want to open in a normal
+// (not incognito) window. Guest session is an exception.
+// chrome://extensions is on the list because it redirects to
+// chrome://settings.
void AdjustNavigateParamsForURL(browser::NavigateParams* params) {
if (!params->target_contents &&
params->url.scheme() == chrome::kChromeUIScheme &&
(params->url.host() == chrome::kChromeUISettingsHost ||
+ params->url.host() == chrome::kChromeUIExtensionsHost ||
params->url.host() == chrome::kChromeUIBookmarksHost)) {
Profile* profile =
params->browser ? params->browser->profile() : params->profile;