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

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

Issue 6721013: extensions: Refactor ExtensionInstallUI class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: indentation Created 9 years, 9 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_uninstall_dialog_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_prompt.mm b/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm
similarity index 66%
rename from chrome/browser/ui/cocoa/extensions/extension_install_prompt.mm
rename to chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm
index 21bb63451b2361572670657923d87144377eee0c..825fc9dccb0a1d1e1bbc5fe106a672bd22ee54c8 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_install_prompt.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm
@@ -8,7 +8,7 @@
#include "base/sys_string_conversions.h"
#include "base/utf_string_conversions.h"
-#include "chrome/browser/extensions/extension_install_dialog.h"
+#include "chrome/browser/extensions/extension_uninstall_dialog.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/extensions/extension.h"
#include "grit/chromium_strings.h"
@@ -17,15 +17,16 @@
#include "ui/base/l10n/l10n_util_mac.h"
#include "ui/base/resource/resource_bundle.h"
-void ShowExtensionInstallDialog(Profile* profile,
- ExtensionInstallUI::Delegate* delegate,
- const Extension* extension,
- SkBitmap* icon,
- ExtensionInstallUI::PromptType type) {
+// static
+void ExtensionUninstallDialog::Show(
+ Profile* profile,
+ ExtensionUninstallDialog::Delegate* delegate,
+ const Extension* extension,
+ SkBitmap* icon) {
NSAlert* alert = [[[NSAlert alloc] init] autorelease];
NSButton* continueButton = [alert addButtonWithTitle:l10n_util::GetNSString(
- ExtensionInstallUI::kButtonIds[type])];
+ IDS_EXTENSION_PROMPT_UNINSTALL_BUTTON)];
// Clear the key equivalent (currently 'Return') because cancel is the default
// button.
[continueButton setKeyEquivalent:@""];
@@ -35,14 +36,13 @@ void ShowExtensionInstallDialog(Profile* profile,
[cancelButton setKeyEquivalent:@"\r"];
[alert setMessageText:l10n_util::GetNSStringF(
- ExtensionInstallUI::kHeadingIds[type],
+ IDS_EXTENSION_UNINSTALL_PROMPT_HEADING,
UTF8ToUTF16(extension->name()))];
[alert setAlertStyle:NSWarningAlertStyle];
[alert setIcon:gfx::SkBitmapToNSImage(*icon)];
- if ([alert runModal] == NSAlertFirstButtonReturn) {
- delegate->InstallUIProceed();
- } else {
- delegate->InstallUIAbort();
- }
+ if ([alert runModal] == NSAlertFirstButtonReturn)
+ delegate->ExtensionDialogAccepted();
+ else
+ delegate->ExtensionDialogCanceled();
}

Powered by Google App Engine
This is Rietveld 408576698