From 550e9940051b17d2b904f3cc6a5a249b7012df19 Mon Sep 17 00:00:00 2001
From: "mpcomplete@chromium.org"
 <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 10 Mar 2010 01:40:34 +0000
Subject: 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
---
 chrome/browser/resources/extensions_ui.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'chrome/browser/resources')

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)" />
-- 
cgit v1.1