| Index: chrome/browser/extensions/extension_install_dialog.cc
|
| diff --git a/chrome/browser/extensions/extension_install_dialog.cc b/chrome/browser/extensions/extension_install_dialog.cc
|
| index c1412d39927952f0b314fdfb9cc47d16e592b3f3..913cd7510c34d6761ce4d267603e7f3441dd10db 100644
|
| --- a/chrome/browser/extensions/extension_install_dialog.cc
|
| +++ b/chrome/browser/extensions/extension_install_dialog.cc
|
| @@ -53,6 +53,8 @@ AutoConfirmForTest CheckAutoConfirmCommandLineSwitch() {
|
| return PROCEED;
|
| else if (value == "cancel")
|
| return ABORT;
|
| + else if (value == "default")
|
| + return DO_NOT_SKIP;
|
| else
|
| NOTREACHED();
|
| return DO_NOT_SKIP;
|
| @@ -70,60 +72,3 @@ void ShowExtensionInstallDialog(Profile* profile,
|
| }
|
| ShowExtensionInstallDialogImpl(profile, delegate, prompt);
|
| }
|
| -
|
| -bool ShowExtensionInstallDialogForManifest(
|
| - Profile* profile,
|
| - ExtensionInstallUI::Delegate* delegate,
|
| - const DictionaryValue* manifest,
|
| - const std::string& id,
|
| - const std::string& localized_name,
|
| - const std::string& localized_description,
|
| - SkBitmap* icon,
|
| - const ExtensionInstallUI::Prompt& prompt,
|
| - scoped_refptr<Extension>* dummy_extension) {
|
| - scoped_ptr<DictionaryValue> localized_manifest;
|
| - if (!localized_name.empty() || !localized_description.empty()) {
|
| - localized_manifest.reset(manifest->DeepCopy());
|
| - if (!localized_name.empty()) {
|
| - localized_manifest->SetString(extension_manifest_keys::kName,
|
| - localized_name);
|
| - }
|
| - if (!localized_description.empty()) {
|
| - localized_manifest->SetString(extension_manifest_keys::kDescription,
|
| - localized_description);
|
| - }
|
| - }
|
| -
|
| - std::string init_errors;
|
| - *dummy_extension = Extension::Create(
|
| - FilePath(),
|
| - Extension::INTERNAL,
|
| - localized_manifest.get() ? *localized_manifest.get() : *manifest,
|
| - Extension::NO_FLAGS,
|
| - id,
|
| - &init_errors);
|
| - if (!dummy_extension->get()) {
|
| - return false;
|
| - }
|
| -
|
| - if (icon->empty())
|
| - icon = const_cast<SkBitmap*>(&Extension::GetDefaultIcon(
|
| - (*dummy_extension)->is_app()));
|
| -
|
| - // In tests, we may have setup to proceed or abort without putting up the real
|
| - // confirmation dialog.
|
| - AutoConfirmForTest auto_confirm = CheckAutoConfirmCommandLineSwitch();
|
| - if (auto_confirm != DO_NOT_SKIP) {
|
| - DoAutoConfirm(auto_confirm, delegate);
|
| - return true;
|
| - }
|
| -
|
| - ExtensionInstallUI::Prompt filled_out_prompt = prompt;
|
| - filled_out_prompt.SetPermissions(
|
| - (*dummy_extension)->GetPermissionMessageStrings());
|
| - filled_out_prompt.set_extension(*dummy_extension);
|
| - filled_out_prompt.set_icon(gfx::Image(new SkBitmap(*icon)));
|
| -
|
| - ShowExtensionInstallDialog(profile, delegate, filled_out_prompt);
|
| - return true;
|
| -}
|
|
|