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

Unified Diff: chrome/browser/usb/web_usb_permission_bubble.cc

Issue 1724183005: Change ChooserBubbleDelegate class name to ChooserBubbleController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merged changes from master, resolved conflicts and updated related files 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/usb/usb_chooser_bubble_delegate.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/usb/web_usb_permission_bubble.cc
diff --git a/chrome/browser/usb/web_usb_permission_bubble.cc b/chrome/browser/usb/web_usb_permission_bubble.cc
index 6ba7d266ef6fbdb2dbaee68bfb40641487393b64..8b6b7d18bbd162f413b75bc9030000f0890cee6d 100644
--- a/chrome/browser/usb/web_usb_permission_bubble.cc
+++ b/chrome/browser/usb/web_usb_permission_bubble.cc
@@ -8,7 +8,7 @@
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/chrome_bubble_manager.h"
-#include "chrome/browser/usb/usb_chooser_bubble_delegate.h"
+#include "chrome/browser/usb/usb_chooser_bubble_controller.h"
#include "components/bubble/bubble_controller.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_frame_host.h"
@@ -33,15 +33,15 @@ void ChromeWebUsbPermissionBubble::GetPermission(
content::WebContents* web_contents =
content::WebContents::FromRenderFrameHost(render_frame_host_);
Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
- scoped_ptr<UsbChooserBubbleDelegate> bubble_delegate(
- new UsbChooserBubbleDelegate(render_frame_host_,
- std::move(device_filters),
- render_frame_host_, callback));
- UsbChooserBubbleDelegate* bubble_delegate_ptr = bubble_delegate.get();
- BubbleReference bubble_controller =
- browser->GetBubbleManager()->ShowBubble(std::move(bubble_delegate));
- bubble_delegate_ptr->set_bubble_controller(bubble_controller);
- bubbles_.push_back(bubble_controller);
+ scoped_ptr<UsbChooserBubbleController> bubble_controller(
+ new UsbChooserBubbleController(render_frame_host_,
+ std::move(device_filters),
+ render_frame_host_, callback));
+ UsbChooserBubbleController* bubble_controller_ptr = bubble_controller.get();
+ BubbleReference bubble_reference =
+ browser->GetBubbleManager()->ShowBubble(std::move(bubble_controller));
+ bubble_controller_ptr->set_bubble_reference(bubble_reference);
+ bubbles_.push_back(bubble_reference);
}
void ChromeWebUsbPermissionBubble::Bind(
« no previous file with comments | « chrome/browser/usb/usb_chooser_bubble_delegate.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698