Make ChromeExtensionChooserDialog::ShowDialog work for MacViews

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

 // Copyright 2016 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.
 
 #import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/extensions/chrome_extension_chooser_dialog.h"
+#include "chrome/browser/ui/browser_dialogs.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_window.h"
 #import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 
 ChooserDialogCocoa::ChooserDialogCocoa(content::WebContents* web_contents,
                                        ChooserController* chooser_controller)
     : web_contents_(web_contents), chooser_controller_(chooser_controller) {
   DCHECK(web_contents_);
   DCHECK(chooser_controller_);
@@ skipping 35 matching lines @@
       CreateAndShowWebModalDialogMac(this, web_contents_, sheet);
 }
 
 void ChooserDialogCocoa::Dismissed() {
   if (constrained_window_)
     constrained_window_->CloseWebContentsModalDialog();
 }
 
 void ChromeExtensionChooserDialog::ShowDialog(
     ChooserController* chooser_controller) const {
+  if (chrome::ToolkitViewsWebUIDialogsEnabled())
+    return ChromeExtensionChooserDialog::ShowDialogImpl(chooser_controller);

[tapted, 2016/06/14 08:49:03]

nit: blank line after

[juncai, 2016/06/14 18:08:22]

Done.

   web_modal::WebContentsModalDialogManager* manager =
       web_modal::WebContentsModalDialogManager::FromWebContents(web_contents_);
   if (manager) {
     // These objects will delete themselves when the dialog closes.
     ChooserDialogCocoa* chooser_dialog =
         new ChooserDialogCocoa(web_contents_, chooser_controller);
     chooser_dialog->ShowDialog();
   }
 }