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

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

Issue 1097603003: Remove knowledge of USB devices from permission prompt implementations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Initialize delegate_ to nullptr. Created 5 years, 8 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/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 351350942c6edf08412eb0432a4801a0276c6569..a83697202296b9bc133867d4522ade3d5ca4528c 100644
--- a/chrome/browser/ui/cocoa/extensions/device_permissions_dialog_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/device_permissions_dialog_controller.mm
@@ -18,12 +18,11 @@ using extensions::DevicePermissionsPrompt;
DevicePermissionsDialogController::DevicePermissionsDialogController(
content::WebContents* web_contents,
- DevicePermissionsPrompt::Delegate* delegate,
scoped_refptr<DevicePermissionsPrompt::Prompt> prompt)
- : delegate_(delegate), prompt_(prompt) {
+ : prompt_(prompt) {
view_controller_.reset(
- [[DevicePermissionsViewController alloc] initWithDelegate:this
- prompt:prompt]);
+ [[DevicePermissionsViewController alloc] initWithController:this
+ prompt:prompt]);
prompt_->SetObserver(this);
@@ -41,10 +40,7 @@ DevicePermissionsDialogController::~DevicePermissionsDialogController() {
prompt_->SetObserver(nullptr);
}
-void DevicePermissionsDialogController::OnUsbDevicesChosen(
- const std::vector<scoped_refptr<device::UsbDevice>>& devices) {
- delegate_->OnUsbDevicesChosen(devices);
- delegate_ = nullptr;
+void DevicePermissionsDialogController::Dismissed() {
constrained_window_->CloseWebContentsModalDialog();
}
@@ -54,14 +50,11 @@ void DevicePermissionsDialogController::OnDevicesChanged() {
void DevicePermissionsDialogController::OnConstrainedWindowClosed(
ConstrainedWindowMac* window) {
- if (delegate_) {
- std::vector<scoped_refptr<device::UsbDevice>> empty;
- delegate_->OnUsbDevicesChosen(empty);
- }
+ prompt_->Dismissed();
base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
}
void ChromeDevicePermissionsPrompt::ShowDialog() {
// These objects will delete themselves when the dialog closes.
- new DevicePermissionsDialogController(web_contents(), delegate(), prompt());
+ new DevicePermissionsDialogController(web_contents(), prompt());
}

Powered by Google App Engine
This is Rietveld 408576698