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

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, 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
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()));
+ }
}
« no previous file with comments | « chrome/browser/ui/cocoa/extensions/device_permissions_dialog_controller.mm ('k') | extensions/browser/api/hid/hid_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698