diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-04 20:49:19 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-04 20:49:19 +0000 |
| commit | f845e14d13d8561c38ff37da4f69a6e3352ca1f8 (patch) | |
| tree | 2ff35a89b816e4e72aa1121bf0dfce24f658c483 /chrome/browser/extensions/extension_dom_ui.cc | |
| parent | e71faec5eaf210f6615ca543788ad41261b467c3 (diff) | |
| download | chromium_src-f845e14d13d8561c38ff37da4f69a6e3352ca1f8.zip chromium_src-f845e14d13d8561c38ff37da4f69a6e3352ca1f8.tar.gz chromium_src-f845e14d13d8561c38ff37da4f69a6e3352ca1f8.tar.bz2 | |
Prevent chrome extension URL overrides from applying in incognito mode.
BUG=39372
Review URL: http://codereview.chromium.org/1940002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_dom_ui.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_dom_ui.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_dom_ui.cc b/chrome/browser/extensions/extension_dom_ui.cc index b553b85..4776e9c 100644 --- a/chrome/browser/extensions/extension_dom_ui.cc +++ b/chrome/browser/extensions/extension_dom_ui.cc @@ -163,10 +163,8 @@ bool ExtensionDOMUI::HandleChromeURLOverride(GURL* url, Profile* profile) { if (!url->SchemeIs(chrome::kChromeUIScheme)) return false; - // Even when the extensions service is enabled by default, it's still - // disabled in incognito mode. - ExtensionsService* service = profile->GetExtensionsService(); - if (!service) + // We can't handle chrome-extension URLs in incognito mode. + if (profile->IsOffTheRecord()) return false; const DictionaryValue* overrides = @@ -176,6 +174,7 @@ bool ExtensionDOMUI::HandleChromeURLOverride(GURL* url, Profile* profile) { if (!overrides || !overrides->GetList(UTF8ToWide(page), &url_list)) return false; + ExtensionsService* service = profile->GetExtensionsService(); if (!service->is_ready()) { // TODO(erikkay) So far, it looks like extensions load before the new tab // page. I don't know if we have anything that enforces this, so add this |