Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1471)

Unified Diff: chrome/browser/extensions/extension_install_dialog.cc

Issue 9456019: Add GTK interface for installing bundles of extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 293adfa3e9d4a497f3bd76e2f9f05cfdaf17674e..73bf65ea1b29feac9333d9996f5215eb39589476 100644
--- a/chrome/browser/extensions/extension_install_dialog.cc
+++ b/chrome/browser/extensions/extension_install_dialog.cc
@@ -59,19 +59,17 @@ AutoConfirmForTest CheckAutoConfirmCommandLineSwitch() {
void ShowExtensionInstallDialog(Profile* profile,
ExtensionInstallUI::Delegate* delegate,
- const Extension* extension,
- SkBitmap* icon,
const ExtensionInstallUI::Prompt& prompt) {
AutoConfirmForTest auto_confirm = CheckAutoConfirmCommandLineSwitch();
if (auto_confirm != DO_NOT_SKIP) {
DoAutoConfirm(auto_confirm, delegate);
return;
}
- ShowExtensionInstallDialogImpl(profile, delegate, extension, icon, prompt);
+ ShowExtensionInstallDialogImpl(profile, delegate, prompt);
}
bool ShowExtensionInstallDialogForManifest(
- Profile *profile,
+ Profile* profile,
ExtensionInstallUI::Delegate* delegate,
const DictionaryValue* manifest,
const std::string& id,
@@ -120,11 +118,9 @@ bool ShowExtensionInstallDialogForManifest(
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(*icon);
- ShowExtensionInstallDialog(profile,
- delegate,
- dummy_extension->get(),
- icon,
- filled_out_prompt);
+ ShowExtensionInstallDialog(profile, delegate, filled_out_prompt);
return true;
}

Powered by Google App Engine
This is Rietveld 408576698