Refactored ExtensionUninstallDialog to take a NativeWindow instead of a Browser

chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_uninstall_dialog.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include <string>
 
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "extensions/common/extension.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
 
 namespace {
 
 // The Cocoa implementation of ExtensionUninstallDialog. This has a less
 // complex life cycle than the Views and GTK implementations because the
 // dialog blocks the page from navigating away and destroying the dialog,
 // so there's no way for the dialog to outlive its delegate.
 class ExtensionUninstallDialogCocoa
     : public extensions::ExtensionUninstallDialog {
  public:
-  ExtensionUninstallDialogCocoa(
-      Profile* profile,
-      Browser* browser,
-      Delegate* delegate);
+  ExtensionUninstallDialogCocoa(Profile* profile,
+                                gfx::NativeWindow parent,
+                                Delegate* delegate);
   virtual ~ExtensionUninstallDialogCocoa() OVERRIDE;
 
  private:
   virtual void Show() OVERRIDE;
+  virtual void RefreshIcon() OVERRIDE;
 };
 
 ExtensionUninstallDialogCocoa::ExtensionUninstallDialogCocoa(
     Profile* profile,
-    Browser* browser,
+    gfx::NativeWindow parent,
     extensions::ExtensionUninstallDialog::Delegate* delegate)
-    : extensions::ExtensionUninstallDialog(profile, browser, delegate) {
+    : extensions::ExtensionUninstallDialog(profile, parent, delegate) {
 }
 
 ExtensionUninstallDialogCocoa::~ExtensionUninstallDialogCocoa() {}
 
 void ExtensionUninstallDialogCocoa::Show() {
   NSAlert* alert = [[[NSAlert alloc] init] autorelease];
 
   NSButton* continueButton = [alert addButtonWithTitle:l10n_util::GetNSString(
       IDS_EXTENSION_PROMPT_UNINSTALL_BUTTON)];
   NSButton* cancelButton = [alert addButtonWithTitle:l10n_util::GetNSString(
       IDS_CANCEL)];
   // Default to accept when triggered via chrome://extensions page.
   if (triggering_extension_) {
     [continueButton setKeyEquivalent:@""];
     [cancelButton setKeyEquivalent:@"\r"];
   }
 
   [alert setMessageText:base::SysUTF8ToNSString(GetHeadingText())];
   [alert setAlertStyle:NSWarningAlertStyle];
   [alert setIcon:gfx::NSImageFromImageSkia(icon_)];
 
   if ([alert runModal] == NSAlertFirstButtonReturn)
     delegate_->ExtensionUninstallAccepted();
   else
     delegate_->ExtensionUninstallCanceled();
 }
 
+void ExtensionUninstallDialogCocoa::RefreshIcon() {
+  // TODO: Refresh the icon in Cocoa somehow

[sashab, 2014/07/23 23:57:26]

tapted: Is this possible?

[tapted, 2014/07/24 00:35:36]

Sadly not :/ - we don't have much control over `NSAlert`, and it's run
application modally so no way* to react to the icon loaded callback while it's
shown. (This might answer sky's question). Although I'm pretty sure all the
_install_ (and permissions) dialogs simply delay showing themselves until the
ImageLoader triggers its OnImageLoaded callback as well.

But for an install it's much more likely that the icon is not ready: for an
_uninstall_ it would be uncommon for an icon to require loading - app launcher
would almost certainly have loaded it already, but extensions can also be
uninstalled from the toolbar action button via right-click. In this case, a null
icon is more probable in this case.


*no way = Cocoa has some threading support - there's a chance altering the
underlying NSImage in a background thread does the right thing, but there be
dragons. Many dragons.

+}
+
 }  // namespace
 
 // static
 extensions::ExtensionUninstallDialog*
 extensions::ExtensionUninstallDialog::Create(Profile* profile,
-                                             Browser* browser,
+                                             gfx::NativeWindow parent,
                                              Delegate* delegate) {
-  return new ExtensionUninstallDialogCocoa(profile, browser, delegate);
+  return new ExtensionUninstallDialogCocoa(profile, parent, delegate);
 }