Chromium Code Reviews| 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..d580bfe53a4bfe2d1d7860a514c1fb333aaeb0cf 100644 |
| --- a/chrome/browser/extensions/extension_install_dialog.cc |
| +++ b/chrome/browser/extensions/extension_install_dialog.cc |
| @@ -12,6 +12,8 @@ |
| #include "base/values.h" |
| #include "chrome/common/chrome_switches.h" |
| #include "chrome/common/extensions/extension.h" |
| +#include "third_party/skia/include/core/SkBitmap.h" |
| +#include "ui/gfx/image/image.h" |
| namespace { |
| @@ -59,19 +61,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 +120,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(gfx::Image(new SkBitmap(*icon))); |
|
Robert Sesek
2012/02/24 19:10:19
FYI: https://chromiumcodereview.appspot.com/945506
jstritar
2012/02/24 20:03:36
Nice!
|
| - ShowExtensionInstallDialog(profile, |
| - delegate, |
| - dummy_extension->get(), |
| - icon, |
| - filled_out_prompt); |
| + ShowExtensionInstallDialog(profile, delegate, filled_out_prompt); |
| return true; |
| } |