diff options
author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-31 18:40:32 +0000 |
---|---|---|
committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-31 18:40:32 +0000 |
commit | bc535ee5bb4eece29f5d88bcc688613b3b208b27 (patch) | |
tree | 37b90c6bbbe98732c81515b35f02f8b835ac5df7 /chrome/browser/resources | |
parent | 7566dbf757617f9e77f4a7f9f031402eb7818b04 (diff) | |
download | chromium_src-bc535ee5bb4eece29f5d88bcc688613b3b208b27.zip chromium_src-bc535ee5bb4eece29f5d88bcc688613b3b208b27.tar.gz chromium_src-bc535ee5bb4eece29f5d88bcc688613b3b208b27.tar.bz2 |
Add support for a "split" incognito behavior for extensions.
- On by default for apps, off by default for extensions.
- Split mode means "run incognito extensions in a separate process if the user
says OK, and the two processes can only see their own profile."
- Spanning mode is what we have now, and means "run a single extension process,
but allow it to access both profiles if the user says OK."
BUG=49232
BUG=49114
TEST=extensions still work in incognito when you check "Allow in Incognito".
Review URL: http://codereview.chromium.org/3210007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58033 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
-rw-r--r-- | chrome/browser/resources/extensions_ui.html | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/chrome/browser/resources/extensions_ui.html b/chrome/browser/resources/extensions_ui.html index 5e9b020..a5671a424 100644 --- a/chrome/browser/resources/extensions_ui.html +++ b/chrome/browser/resources/extensions_ui.html @@ -378,12 +378,14 @@ var extensionDataFormat = { { 'path': 'toolstrip.html', 'renderViewId': 1, - 'renderProcessId': 1 + 'renderProcessId': 1, + 'incognito': false }, { 'path': 'background.html', 'renderViewId': 2, - 'renderProcessId': 1 + 'renderProcessId': 1, + 'incognito': false } ] }, @@ -415,7 +417,8 @@ var extensionDataFormat = { { 'path': 'foo/bar/toolstrip.html', 'renderViewId': 3, - 'renderProcessId': 1 + 'renderProcessId': 1, + 'incognito': false } ], "hasPopupAction": false @@ -856,10 +859,13 @@ document.addEventListener('DOMContentLoaded', requestExtensionsData); </span> <ul class="extension-views"> <li jsselect="views"> - <a jsvalues=".extensionView:$this" href="#" - onclick="sendInspectMessage(this.extensionView); return false;"> - <span jscontent="path"></span> - </a> + <span jsvalues=".extensionView:$this"> + <a jsvalues=".extensionView:$this" href="#" + onclick="sendInspectMessage(this.extensionView); return false;"> + <span jscontent="path"></span></a> + <span jsdisplay="incognito" + i18n-content="viewIncognito">(INCOGNITO)</span> + </span> </li> <li i18n-content="inspectPopupsInstructions" class="inspectPopupNote" jsdisplay="hasPopupAction"> |