Change ChooserController ownership model

chrome/browser/ui/views/browser_dialogs_views.cc

 // Copyright 2015 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/ui/browser_dialogs.h"
 
+#include <memory>
+
 #include "chrome/browser/extensions/api/chrome_device_permissions_prompt.h"
 #include "chrome/browser/extensions/chrome_extension_chooser_dialog.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/ui/login/login_handler.h"
 #include "chrome/browser/ui/views/new_task_manager_view.h"
+#include "components/chooser_controller/chooser_controller.h"

[msw, 2016/06/22 18:23:17]

nit: does chrome_extension_chooser_dialog.h's forward decl suffice here?

[juncai, 2016/06/22 22:41:20]

Tried commenting this #include, but got compile errors.

 
 // This file provides definitions of desktop browser dialog-creation methods for
 // all toolkit-views platforms other than Mac. It also provides the definitions
 // on Mac when mac_views_browser=1 is specified in GYP_DEFINES. The file is
 // excluded in a Mac Cocoa build: definitions under chrome/browser/ui/cocoa may
 // select at runtime whether to show a Cocoa dialog, or the toolkit-views dialog
 // provided by browser_dialogs.h.
 
 // static
 LoginHandler* LoginHandler::Create(net::AuthChallengeInfo* auth_info,
@@ skipping 14 matching lines @@
 ExtensionInstallPrompt::ShowDialogCallback
 ExtensionInstallPrompt::GetDefaultShowDialogCallback() {
   return ExtensionInstallPrompt::GetViewsShowDialogCallback();
 }
 
 void ChromeDevicePermissionsPrompt::ShowDialog() {
   ShowDialogViews();
 }
 
 void ChromeExtensionChooserDialog::ShowDialog(
-    ChooserController* chooser_controller) const {
-  ShowDialogImpl(chooser_controller);
+    std::unique_ptr<ChooserController> chooser_controller) const {
+  ShowDialogImpl(std::move(chooser_controller));
 }
 
 namespace chrome {
 
 ui::TableModel* ShowTaskManager(Browser* browser) {
   return task_management::NewTaskManagerView::Show(browser);
 }
 
 void HideTaskManager() {
   task_management::NewTaskManagerView::Hide();
 }
 
 bool NotifyOldTaskManagerBytesRead(const net::URLRequest& request,
                                    int64_t bytes_read) {
   return false;
 }
 
 }  // namespace chrome