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

Side by Side Diff: chrome/browser/usb/usb_chooser_bubble_delegate.cc

Issue 1572743002: Make sure bubbles in Views default to close before their RenderFrameHosts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: Move DCHECK string into longer comment Created 4 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/usb/usb_chooser_bubble_delegate.h" 5 #include "chrome/browser/usb/usb_chooser_bubble_delegate.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 return true; 66 return true;
67 } 67 }
68 } 68 }
69 69
70 return false; 70 return false;
71 } 71 }
72 72
73 } // namespace 73 } // namespace
74 74
75 UsbChooserBubbleDelegate::UsbChooserBubbleDelegate( 75 UsbChooserBubbleDelegate::UsbChooserBubbleDelegate(
76 Browser* browser, 76 content::RenderFrameHost* owner,
77 mojo::Array<device::usb::DeviceFilterPtr> device_filters, 77 mojo::Array<device::usb::DeviceFilterPtr> device_filters,
78 content::RenderFrameHost* render_frame_host, 78 content::RenderFrameHost* render_frame_host,
79 const webusb::WebUsbPermissionBubble::GetPermissionCallback& callback) 79 const webusb::WebUsbPermissionBubble::GetPermissionCallback& callback)
80 : ChooserBubbleDelegate(browser), 80 : ChooserBubbleDelegate(owner),
81 render_frame_host_(render_frame_host), 81 render_frame_host_(render_frame_host),
82 callback_(callback), 82 callback_(callback),
83 usb_service_observer_(this), 83 usb_service_observer_(this),
84 weak_factory_(this) { 84 weak_factory_(this) {
85 device::UsbService* usb_service = 85 device::UsbService* usb_service =
86 device::DeviceClient::Get()->GetUsbService(); 86 device::DeviceClient::Get()->GetUsbService();
87 if (!usb_service) 87 if (!usb_service)
88 return; 88 return;
89 89
90 if (!usb_service_observer_.IsObserving(usb_service)) 90 if (!usb_service_observer_.IsObserving(usb_service))
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 } 187 }
188 } 188 }
189 if (observer()) 189 if (observer())
190 observer()->OnOptionsInitialized(); 190 observer()->OnOptionsInitialized();
191 } 191 }
192 192
193 void UsbChooserBubbleDelegate::set_bubble_controller( 193 void UsbChooserBubbleDelegate::set_bubble_controller(
194 BubbleReference bubble_controller) { 194 BubbleReference bubble_controller) {
195 bubble_controller_ = bubble_controller; 195 bubble_controller_ = bubble_controller;
196 } 196 }
OLDNEW
« no previous file with comments | « chrome/browser/usb/usb_chooser_bubble_delegate.h ('k') | chrome/browser/usb/web_usb_permission_bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698