summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-10 01:40:34 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-10 01:40:34 +0000
commit550e9940051b17d2b904f3cc6a5a249b7012df19 (patch)
treea7ead5948fcf2dcc605660bfaed77d0172af5b45 /chrome/browser/resources
parentf28ca35d25c88f43f36c123e9e15e7d969b92372 (diff)
downloadchromium_src-550e9940051b17d2b904f3cc6a5a249b7012df19.zip
chromium_src-550e9940051b17d2b904f3cc6a5a249b7012df19.tar.gz
chromium_src-550e9940051b17d2b904f3cc6a5a249b7012df19.tar.bz2
Fix few remaining issues with incognito extensions.
- Open the options page in a regular browser window. - Rip out the "incognito" permission and revise the warning dialog. BUG=37677 Review URL: http://codereview.chromium.org/749002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41109 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
-rw-r--r--chrome/browser/resources/extensions_ui.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/resources/extensions_ui.html b/chrome/browser/resources/extensions_ui.html
index c96c404..399f919 100644
--- a/chrome/browser/resources/extensions_ui.html
+++ b/chrome/browser/resources/extensions_ui.html
@@ -550,7 +550,7 @@ function handleToggleExtensionIncognito(node, toggleCheckbox) {
if (toggleCheckbox)
node.checked = !node.checked;
- if (node.checked && !node.incognitoSafe) {
+ if (node.checked) {
if (!confirm(templateData["enableIncognitoWarning"])) {
node.checked = false;
return;
@@ -856,7 +856,7 @@ function autoUpdate() {
jsdisplay="enabled && experimentalIncognito"
>|</span>
<input type="checkbox"
- jsvalues=".extensionId:id;.enabled=enabled"
+ jsvalues=".extensionId:id;.enabled:enabled"
jsdisplay="enabled && experimentalIncognito"
jseval="this.checked = enabledIncognito"
onchange="handleToggleExtensionIncognito(this, false)" />