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

Unified Diff: chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm

Issue 313203004: Make ExtensionInstallPrompt::Prompt ref-counted (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Latest master for CQ Created 6 years, 6 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/ui/cocoa/extensions/extension_install_view_controller.mm
diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm
index eeb45a33de0f4cb5fc1077dcb838549c09a6fe78..62c482e9dc3c2820d40bb032c9c08c34a10801a9 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm
@@ -180,17 +180,17 @@ bool HasAttribute(id item, CellAttributesMask attributeMask) {
- (id)initWithNavigator:(content::PageNavigator*)navigator
delegate:(ExtensionInstallPrompt::Delegate*)delegate
- prompt:(const ExtensionInstallPrompt::Prompt&)prompt {
+ prompt:(scoped_refptr<ExtensionInstallPrompt::Prompt>)prompt {
// We use a different XIB in the case of bundle installs, installs with
// webstore data, or no permission warnings. These are laid out nicely for
// the data they display.
NSString* nibName = nil;
- if (prompt.type() == ExtensionInstallPrompt::BUNDLE_INSTALL_PROMPT) {
+ if (prompt->type() == ExtensionInstallPrompt::BUNDLE_INSTALL_PROMPT) {
nibName = @"ExtensionInstallPromptBundle";
- } else if (prompt.has_webstore_data()) {
+ } else if (prompt->has_webstore_data()) {
nibName = @"ExtensionInstallPromptWebstoreData";
- } else if (!prompt.ShouldShowPermissions() &&
- prompt.GetRetainedFileCount() == 0) {
+ } else if (!prompt->ShouldShowPermissions() &&
+ prompt->GetRetainedFileCount() == 0) {
nibName = @"ExtensionInstallPromptNoWarnings";
} else {
nibName = @"ExtensionInstallPrompt";
@@ -200,8 +200,8 @@ bool HasAttribute(id item, CellAttributesMask attributeMask) {
bundle:base::mac::FrameworkBundle()])) {
navigator_ = navigator;
delegate_ = delegate;
- prompt_.reset(new ExtensionInstallPrompt::Prompt(prompt));
- warnings_.reset([[self buildWarnings:prompt] retain]);
+ prompt_ = prompt;
+ warnings_.reset([[self buildWarnings:*prompt] retain]);
}
return self;
}

Powered by Google App Engine
This is Rietveld 408576698