| Index: chrome/browser/ui/cocoa/extensions/device_permissions_dialog_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/extensions/device_permissions_dialog_controller.mm b/chrome/browser/ui/cocoa/extensions/device_permissions_dialog_controller.mm
|
| index 5bf1d3f5b7486a3ced69dfb8e071d2b9bada0479..351350942c6edf08412eb0432a4801a0276c6569 100644
|
| --- a/chrome/browser/ui/cocoa/extensions/device_permissions_dialog_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/extensions/device_permissions_dialog_controller.mm
|
| @@ -8,6 +8,7 @@
|
| #include "base/location.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/thread_task_runner_handle.h"
|
| +#include "chrome/browser/extensions/api/chrome_device_permissions_prompt.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/device_permissions_view_controller.h"
|
| @@ -15,18 +16,6 @@
|
|
|
| using extensions::DevicePermissionsPrompt;
|
|
|
| -namespace {
|
| -
|
| -void ShowDevicePermissionsDialogImpl(
|
| - content::WebContents* web_contents,
|
| - DevicePermissionsPrompt::Delegate* delegate,
|
| - scoped_refptr<DevicePermissionsPrompt::Prompt> prompt) {
|
| - // These objects will delete themselves when the dialog closes.
|
| - new DevicePermissionsDialogController(web_contents, delegate, prompt);
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| DevicePermissionsDialogController::DevicePermissionsDialogController(
|
| content::WebContents* web_contents,
|
| DevicePermissionsPrompt::Delegate* delegate,
|
| @@ -72,8 +61,7 @@ void DevicePermissionsDialogController::OnConstrainedWindowClosed(
|
| base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
|
| }
|
|
|
| -// static
|
| -DevicePermissionsPrompt::ShowDialogCallback
|
| -DevicePermissionsPrompt::GetDefaultShowDialogCallback() {
|
| - return base::Bind(&ShowDevicePermissionsDialogImpl);
|
| +void ChromeDevicePermissionsPrompt::ShowDialog() {
|
| + // These objects will delete themselves when the dialog closes.
|
| + new DevicePermissionsDialogController(web_contents(), delegate(), prompt());
|
| }
|
|
|