diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-17 00:16:02 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-17 00:16:02 +0000 |
| commit | 3a91eff218570a1d5c322262c96fbb0a41e3b580 (patch) | |
| tree | a3c651c9db024510d0d800b8a0d185d41dc0cce2 /chrome/browser/resources/extensions_ui.html | |
| parent | dabaa73dceb1772448ed1ff6935471946da53143 (diff) | |
| download | chromium_src-3a91eff218570a1d5c322262c96fbb0a41e3b580.zip chromium_src-3a91eff218570a1d5c322262c96fbb0a41e3b580.tar.gz chromium_src-3a91eff218570a1d5c322262c96fbb0a41e3b580.tar.bz2 | |
Spruced up the warning dialog for when you enable an extension in incognito.
I hijacked the extension install/uninstall dialog, and added another type that
it can transmogrify into.
BUG=32365
Review URL: http://codereview.chromium.org/1041002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41787 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources/extensions_ui.html')
| -rw-r--r-- | chrome/browser/resources/extensions_ui.html | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/chrome/browser/resources/extensions_ui.html b/chrome/browser/resources/extensions_ui.html index 399f919..657c342 100644 --- a/chrome/browser/resources/extensions_ui.html +++ b/chrome/browser/resources/extensions_ui.html @@ -547,16 +547,13 @@ function handleEnableExtension(node, enable) { * Handles the 'enableIncognito' checkbox getting changed. */ function handleToggleExtensionIncognito(node, toggleCheckbox) { - if (toggleCheckbox) - node.checked = !node.checked; + var enable = toggleCheckbox ? !node.checked : node.checked; - if (node.checked) { - if (!confirm(templateData["enableIncognitoWarning"])) { - node.checked = false; - return; - } - } - chrome.send('enableIncognito', [node.extensionId, String(node.checked)]); + // This is kinda cheesy, but if we're enabling, we have to wait for the + // prompt, so don't show as enabled until the user says OK. + node.checked = false; + + chrome.send('enableIncognito', [node.extensionId, String(enable)]); requestExtensionsData(); } |