Refactored ExtensionUninstallDialog to take a NativeWindow instead of a Browser

chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc

 // Copyright (c) 2012 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"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 24 matching lines @@
 gfx::NativeWindow GetParent(Browser* browser) {
   if (browser && browser->window())
     return browser->window()->GetNativeWindow();
   return NULL;
 }
 
 // Views implementation of the uninstall dialog.
 class ExtensionUninstallDialogViews
     : public extensions::ExtensionUninstallDialog {
  public:
+  // Exactly one of |browser| and |parent| should be NULL. If |browser| is set,
+  // this is for launching from a browser window. If |parent| is set, this is
+  // launching from a non-browser window.
   ExtensionUninstallDialogViews(
       Profile* profile,
       Browser* browser,
+      gfx::NativeWindow parent,
       extensions::ExtensionUninstallDialog::Delegate* delegate);
   virtual ~ExtensionUninstallDialogViews();
 
   // Forwards the accept and cancels to the delegate.
   void ExtensionUninstallAccepted();
   void ExtensionUninstallCanceled();
 
   ExtensionUninstallDialogDelegateView* view() { return view_; }
 
  private:
   virtual void Show() OVERRIDE;
 
   ExtensionUninstallDialogDelegateView* view_;
-  bool show_in_app_list_;
+  gfx::NativeWindow parent_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionUninstallDialogViews);
 };
 
 // The dialog's view, owned by the views framework.
 class ExtensionUninstallDialogDelegateView : public views::DialogDelegateView {
  public:
   ExtensionUninstallDialogDelegateView(
       ExtensionUninstallDialogViews* dialog_view,
       const extensions::Extension* extension,
@@ skipping 33 matching lines @@
   views::ImageView* icon_;
   views::Label* heading_;
   bool triggered_by_extension_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionUninstallDialogDelegateView);
 };
 
 ExtensionUninstallDialogViews::ExtensionUninstallDialogViews(
     Profile* profile,
     Browser* browser,
+    gfx::NativeWindow parent,
     extensions::ExtensionUninstallDialog::Delegate* delegate)
     : extensions::ExtensionUninstallDialog(profile, browser, delegate),
       view_(NULL),
-      show_in_app_list_(!browser) {
+      parent_(parent) {
 }
 
 ExtensionUninstallDialogViews::~ExtensionUninstallDialogViews() {
   // Close the widget (the views framework will delete view_).
   if (view_) {
     view_->DialogDestroyed();
     view_->GetWidget()->CloseNow();
   }
 }
 
 void ExtensionUninstallDialogViews::Show() {
-  // TODO(tapted): A true |desktop_type| needs to be passed in at creation time
-  // to remove reliance on GetActiveDesktop(). http://crbug.com/308360
-  gfx::NativeWindow parent = show_in_app_list_ ?
-      AppListService::Get(chrome::GetActiveDesktop())->GetAppListWindow() :
-      GetParent(browser_);
-  if (browser_ && !parent) {
+  if (browser_ && !GetParent(browser_)) {

[tapted, 2014/07/11 04:39:15]

From the earlier CL, this needed a comment - If I understand the comment
correctly, something like

// Callers of ExtensionUninstallDialog::Create() expect a non-NULL result, but
it's possible that a browser window couldn't be found. In that case, immediately
cancel the dialog when shown.

[sashab, 2014/07/11 05:58:57]

Yup, I understand. Done.

     delegate_->ExtensionUninstallCanceled();
     return;
   }
 
   view_ = new ExtensionUninstallDialogDelegateView(
       this, extension_, triggering_extension_, &icon_);
-  CreateBrowserModalDialogViews(view_, parent)->Show();
+  CreateBrowserModalDialogViews(view_, parent_ ? parent_ : GetParent(browser_))

[tapted, 2014/07/11 04:39:15]

What happens if both browser_ and parent_ are NULL? I think this will segfault.
Currently I *think* CreateBrowserModalDialogViews has a fallback to center the
dialog in the screen, which you might need to keep.

[sashab, 2014/07/11 05:58:57]

If you follow the logic carefully, this is actually the exact same behaviour as
before (show_in_app_list_ is !browser_). The comment on the constructor says
that exactly one of |browser_| and |parent_| must be NULL, so they can't both be
NULL. We know GetParent(browser_) is not-NULL because the previous if-statement
returns.

CreateBrowserModalDialogViews is actually safe to call with NULL anyway - it
just creates a non-parented window (so an independent window). So even if they
could both be NULL, this wouldn't segfault.

I originally had a DCHECK(parent_ ^ browser_) somewhere, but thought it was too
obscure/reflected badly in the class's design. So I left it open here, and as
you can see, it's probably safe if they're both NULL anyway.

[tapted, 2014/07/11 06:10:40]

ah - I think I read it as

... : GetParent(browser)
    ->Show());

instead of

... : GetParent(browser))
    ->Show();


I think a separate variable will help here - we're spread across 2 lines anyway.
i.e.

  gfx::NativeWindow parent = parent ? parent : GetParent(browser_);
  CreateBrowserModalDialogViews(view_, parent)->Show();

[sashab, 2014/07/13 22:57:25]

Done.

+      ->Show();
 }
 
 void ExtensionUninstallDialogViews::ExtensionUninstallAccepted() {
   // The widget gets destroyed when the dialog is accepted.
   view_ = NULL;
   delegate_->ExtensionUninstallAccepted();
 }
 
 void ExtensionUninstallDialogViews::ExtensionUninstallCanceled() {
   // The widget gets destroyed when the dialog is canceled.
@@ skipping 87 matching lines @@
   }
 }
 
 }  // namespace
 
 // static
 extensions::ExtensionUninstallDialog*
 extensions::ExtensionUninstallDialog::Create(Profile* profile,
                                              Browser* browser,
                                              Delegate* delegate) {
-  return new ExtensionUninstallDialogViews(profile, browser, delegate);
+  return new ExtensionUninstallDialogViews(profile, browser, NULL, delegate);
 }
+
+// static
+extensions::ExtensionUninstallDialog*
+extensions::ExtensionUninstallDialog::CreateForNonBrowserWindow(

[tapted, 2014/07/11 04:39:15]

You'll need a mac version of this too

[sashab, 2014/07/11 05:58:57]

Done. Please test that the Uninstall dialog still works from the Mac app list
for me :)

+    Profile* profile,
+    gfx::NativeWindow parent,
+    Delegate* delegate) {
+  return new ExtensionUninstallDialogViews(profile, NULL, parent, delegate);
+}