Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2440)

Unified Diff: chrome/browser/ui/cocoa/extensions/device_permissions_dialog_controller.mm

Issue 1115213004: Add chrome.hid.getUserSelectedDevices API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/views/extensions/device_permissions_dialog_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a83697202296b9bc133867d4522ade3d5ca4528c..6babaf28c4f369a6bcdc2f351829045c1c723057 100644
--- a/chrome/browser/ui/cocoa/extensions/device_permissions_dialog_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/device_permissions_dialog_controller.mm
@@ -12,6 +12,7 @@
#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"
+#include "components/web_modal/web_contents_modal_dialog_manager.h"
#include "device/usb/usb_device.h"
using extensions::DevicePermissionsPrompt;
@@ -55,6 +56,14 @@ void DevicePermissionsDialogController::OnConstrainedWindowClosed(
}
void ChromeDevicePermissionsPrompt::ShowDialog() {
- // These objects will delete themselves when the dialog closes.
- new DevicePermissionsDialogController(web_contents(), prompt());
+ web_modal::WebContentsModalDialogManager* manager =
+ web_modal::WebContentsModalDialogManager::FromWebContents(web_contents());
+ if (manager) {
+ // These objects will delete themselves when the dialog closes.
+ new DevicePermissionsDialogController(web_contents(), prompt());
+ } else {
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
+ FROM_HERE,
+ base::Bind(&DevicePermissionsPrompt::Prompt::Dismissed, prompt()));
+ }
}
« no previous file with comments | « no previous file | chrome/browser/ui/views/extensions/device_permissions_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698