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

Unified Diff: chrome/browser/ui/views/extensions/device_permissions_dialog_view.cc

Issue 1115213004: Add chrome.hid.getUserSelectedDevices API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 5 years, 7 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
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..82b839ffc2b362e85b32c68f645e5c9bb5ed6880 100644
--- a/chrome/browser/ui/views/extensions/device_permissions_dialog_view.cc
+++ b/chrome/browser/ui/views/extensions/device_permissions_dialog_view.cc
@@ -8,6 +8,7 @@
#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 +157,13 @@ 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 {
+ prompt()->Dismissed();
+ }
}

Powered by Google App Engine
This is Rietveld 408576698