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

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

Issue 599303004: Add getUserSelectedDevices to the USB extensions API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add device_permissions_prompt.* to BUILD.gn. Created 6 years, 2 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 4633ac211af6963dbdd035616d4d3cfb7c9ac21d..884fb13f82ac982088c436327b55129538b0bd1c 100644
--- a/chrome/browser/ui/views/extensions/device_permissions_dialog_view.cc
+++ b/chrome/browser/ui/views/extensions/device_permissions_dialog_view.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/ui/views/extensions/device_permissions_dialog_view.h"
#include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/extensions/api/chrome_device_permissions_prompt.h"
#include "chrome/browser/ui/views/constrained_window_views.h"
#include "chrome/grit/generated_resources.h"
#include "content/public/browser/browser_thread.h"
@@ -21,19 +22,6 @@
using device::UsbDevice;
using extensions::DevicePermissionsPrompt;
-namespace {
-
-void ShowDevicePermissionsDialogImpl(
- content::WebContents* web_contents,
- DevicePermissionsPrompt::Delegate* delegate,
- scoped_refptr<DevicePermissionsPrompt::Prompt> prompt) {
- DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
- ShowWebModalDialogViews(new DevicePermissionsDialogView(delegate, prompt),
- web_contents);
-}
-
-} // namespace
-
class DevicePermissionsTableModel
: public ui::TableModel,
public DevicePermissionsPrompt::Prompt::Observer {
@@ -173,8 +161,8 @@ gfx::Size DevicePermissionsDialogView::GetPreferredSize() const {
return gfx::Size(500, 250);
}
-// static
-DevicePermissionsPrompt::ShowDialogCallback
-DevicePermissionsPrompt::GetDefaultShowDialogCallback() {
- return base::Bind(&ShowDevicePermissionsDialogImpl);
+void ChromeDevicePermissionsPrompt::ShowDialog() {
+ DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+ ShowWebModalDialogViews(new DevicePermissionsDialogView(delegate(), prompt()),
+ web_contents());
}
« no previous file with comments | « chrome/browser/ui/cocoa/extensions/device_permissions_dialog_controller.mm ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698