Index: chrome/browser/ui/views/extensions/device_permissions_dialog_view.cc |
diff --git a/chrome/browser/ui/views/extensions/device_permissions_dialog_view.cc b/chrome/browser/ui/views/extensions/device_permissions_dialog_view.cc |
index d3e98dd224ee7b30e1f71326e6decca4443f90e0..951ef660e2d989076a14c1e444e3e741f25c140c 100644 |
--- a/chrome/browser/ui/views/extensions/device_permissions_dialog_view.cc |
+++ b/chrome/browser/ui/views/extensions/device_permissions_dialog_view.cc |
@@ -4,10 +4,15 @@ |
#include "chrome/browser/ui/views/extensions/device_permissions_dialog_view.h" |
+#include "base/bind.h" |
+#include "base/location.h" |
+#include "base/single_thread_task_runner.h" |
#include "base/strings/utf_string_conversions.h" |
+#include "base/thread_task_runner_handle.h" |
#include "chrome/browser/extensions/api/chrome_device_permissions_prompt.h" |
#include "chrome/grit/generated_resources.h" |
#include "components/constrained_window/constrained_window_views.h" |
+#include "components/web_modal/popup_manager.h" |
#include "content/public/browser/browser_thread.h" |
#include "device/usb/usb_device.h" |
#include "extensions/common/extension.h" |
@@ -156,6 +161,15 @@ gfx::Size DevicePermissionsDialogView::GetPreferredSize() const { |
void ChromeDevicePermissionsPrompt::ShowDialog() { |
DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
- constrained_window::ShowWebModalDialogViews( |
- new DevicePermissionsDialogView(prompt()), web_contents()); |
+ |
+ web_modal::PopupManager* popup_manager = |
+ web_modal::PopupManager::FromWebContents(web_contents()); |
+ if (popup_manager) { |
+ constrained_window::ShowWebModalDialogViews( |
+ new DevicePermissionsDialogView(prompt()), web_contents()); |
+ } else { |
+ base::ThreadTaskRunnerHandle::Get()->PostTask( |
+ FROM_HERE, |
+ base::Bind(&DevicePermissionsPrompt::Prompt::Dismissed, prompt())); |
+ } |
} |