diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 22:10:50 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 22:10:50 +0000 |
| commit | db7331aecb1f0c01aecf4cd4627d08a8d5b08bc2 (patch) | |
| tree | 5a33fc21cb1628462f9e365add27aeaf058d60fc /chrome/browser/dom_ui | |
| parent | f56abff188b90b7f2d67a094930d7d9407df507d (diff) | |
| download | chromium_src-db7331aecb1f0c01aecf4cd4627d08a8d5b08bc2.zip chromium_src-db7331aecb1f0c01aecf4cd4627d08a8d5b08bc2.tar.gz chromium_src-db7331aecb1f0c01aecf4cd4627d08a8d5b08bc2.tar.bz2 | |
Allow users to enable extensions in incognito. Requires
--enable-experimental-extension-apis . The UI needs work. Tab and window
events are hooked up so that they work with incognito tabs/windows when
enabled.
BUG=32365
BUG=36292
Review URL: http://codereview.chromium.org/657041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40057 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
| -rw-r--r-- | chrome/browser/dom_ui/dom_ui_factory.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/dom_ui/dom_ui_factory.cc b/chrome/browser/dom_ui/dom_ui_factory.cc index 6f0c275..e35063e 100644 --- a/chrome/browser/dom_ui/dom_ui_factory.cc +++ b/chrome/browser/dom_ui/dom_ui_factory.cc @@ -35,11 +35,13 @@ DOMUI* NewDOMUI(TabContents* contents, const GURL& url) { // Special case for extensions. template<> DOMUI* NewDOMUI<ExtensionDOMUI>(TabContents* contents, const GURL& url) { - // Don't use a DOMUI for non-existent extensions. + // Don't use a DOMUI for non-existent extensions or for incognito tabs. The + // latter restriction is because we require extensions to run within a single + // process. ExtensionsService* service = contents->profile()->GetExtensionsService(); bool valid_extension = (service && service->GetExtensionById(url.host(), false)); - if (valid_extension) + if (valid_extension && !contents->profile()->IsOffTheRecord()) return new ExtensionDOMUI(contents); return NULL; } |