| Index: chrome/browser/extensions/extension_install_prompt.h
|
| diff --git a/chrome/browser/extensions/extension_install_prompt.h b/chrome/browser/extensions/extension_install_prompt.h
|
| index 81edbec3cb32165d367570c0782c540249ecd02d..f55887782df7a985f5955e816689d25e32dad6d3 100644
|
| --- a/chrome/browser/extensions/extension_install_prompt.h
|
| +++ b/chrome/browser/extensions/extension_install_prompt.h
|
| @@ -309,7 +309,7 @@ class ExtensionInstallPrompt
|
| virtual void ConfirmBundleInstall(
|
| extensions::BundleInstaller* bundle,
|
| const SkBitmap* icon,
|
| - const extensions::PermissionSet* permissions);
|
| + scoped_ptr<const extensions::PermissionSet> permissions);
|
|
|
| // This is called by the bundle installer to verify the permissions for a
|
| // delegated bundle install.
|
| @@ -319,7 +319,7 @@ class ExtensionInstallPrompt
|
| extensions::BundleInstaller* bundle,
|
| const std::string& delegated_username,
|
| const SkBitmap* icon,
|
| - const extensions::PermissionSet* permissions);
|
| + scoped_ptr<const extensions::PermissionSet> permissions);
|
|
|
| // This is called by the standalone installer to verify whether the install
|
| // from the webstore should proceed.
|
| @@ -381,9 +381,10 @@ class ExtensionInstallPrompt
|
| // extension may be granted additional permissions.
|
| //
|
| // We *MUST* eventually call either Proceed() or Abort() on |delegate|.
|
| - virtual void ConfirmPermissions(Delegate* delegate,
|
| - const extensions::Extension* extension,
|
| - const extensions::PermissionSet* permissions);
|
| + virtual void ConfirmPermissions(
|
| + Delegate* delegate,
|
| + const extensions::Extension* extension,
|
| + scoped_ptr<const extensions::PermissionSet> permissions);
|
|
|
| // This is called by the app handler launcher to review what permissions the
|
| // extension or app currently has.
|
| @@ -452,7 +453,7 @@ class ExtensionInstallPrompt
|
|
|
| // A custom set of permissions to show in the install prompt instead of the
|
| // extension's active permissions.
|
| - scoped_refptr<const extensions::PermissionSet> custom_permissions_;
|
| + scoped_ptr<const extensions::PermissionSet> custom_permissions_;
|
|
|
| // The object responsible for doing the UI specific actions.
|
| scoped_ptr<extensions::ExtensionInstallUI> install_ui_;
|
|
|