diff options
| -rw-r--r-- | chrome/app/generated_resources.grd | 2 | ||||
| -rw-r--r-- | chrome/browser/extensions/extensions_ui.cc | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 1ee1a59..0b1d193 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -3243,7 +3243,7 @@ each locale. --> Are you sure you want to uninstall this extension? </message> <message name="IDS_EXTENSION_PROMPT_WARNING_INCOGNITO" desc="The warning you get when you are about to enable an extension in incognito."> - Because <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> does not control how extensions handle your personal data, this extension could leave traces on your machine even after you close the incognito window. Allow anyway? + Are you sure you want to allow this extension to run in incognito? <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> cannot prevent this extension from recording your browsing data. </message> <message name="IDS_EXTENSION_PROMPT_WARNING_NEW_BROWSER" desc="Warning displayed in body of extension dialog when the extension requires access to browser APIs."> This extension will have access to your browsing history. diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc index fbaca6a..7fe0e87 100644 --- a/chrome/browser/extensions/extensions_ui.cc +++ b/chrome/browser/extensions/extensions_ui.cc @@ -448,6 +448,9 @@ void ExtensionsDOMHandler::HandleEnableIncognitoMessage(const Value* value) { DCHECK(extension); if (enable_str == "true") { + if (!extension_id_prompting_.empty()) + return; // only one prompt at a time + // Prompt the user first. scoped_ptr<SkBitmap> icon; Extension::DecodeIcon(extension, Extension::EXTENSION_ICON_LARGE, &icon); @@ -473,6 +476,9 @@ void ExtensionsDOMHandler::HandleUninstallMessage(const Value* value) { if (!extension) return; + if (!extension_id_prompting_.empty()) + return; // only one prompt at a time + scoped_ptr<SkBitmap> uninstall_icon; Extension::DecodeIcon(extension, Extension::EXTENSION_ICON_LARGE, &uninstall_icon); |