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

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

Issue 2748443005: Rename website_settings UI folders to permission_bubble. (Closed)
Patch Set: Rebase. Created 3 years, 9 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/web_usb_chooser_service.h" 5 #include "chrome/browser/usb/web_usb_chooser_service.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "chrome/browser/ui/browser_finder.h" 9 #include "chrome/browser/ui/browser_finder.h"
10 #include "chrome/browser/ui/chrome_bubble_manager.h" 10 #include "chrome/browser/ui/chrome_bubble_manager.h"
11 #include "chrome/browser/ui/website_settings/chooser_bubble_delegate.h" 11 #include "chrome/browser/ui/permission_bubble/chooser_bubble_delegate.h"
12 #include "chrome/browser/usb/usb_chooser_controller.h" 12 #include "chrome/browser/usb/usb_chooser_controller.h"
13 #include "components/bubble/bubble_controller.h" 13 #include "components/bubble/bubble_controller.h"
14 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
15 #include "content/public/browser/render_frame_host.h" 15 #include "content/public/browser/render_frame_host.h"
16 16
17 WebUsbChooserService::WebUsbChooserService( 17 WebUsbChooserService::WebUsbChooserService(
18 content::RenderFrameHost* render_frame_host) 18 content::RenderFrameHost* render_frame_host)
19 : render_frame_host_(render_frame_host) { 19 : render_frame_host_(render_frame_host) {
20 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 20 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
21 DCHECK(render_frame_host); 21 DCHECK(render_frame_host);
(...skipping 20 matching lines...) Expand all
42 BubbleReference bubble_reference = browser->GetBubbleManager()->ShowBubble( 42 BubbleReference bubble_reference = browser->GetBubbleManager()->ShowBubble(
43 std::move(chooser_bubble_delegate)); 43 std::move(chooser_bubble_delegate));
44 bubbles_.push_back(bubble_reference); 44 bubbles_.push_back(bubble_reference);
45 } 45 }
46 46
47 void WebUsbChooserService::Bind( 47 void WebUsbChooserService::Bind(
48 mojo::InterfaceRequest<device::usb::ChooserService> request) { 48 mojo::InterfaceRequest<device::usb::ChooserService> request) {
49 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 49 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
50 bindings_.AddBinding(this, std::move(request)); 50 bindings_.AddBinding(this, std::move(request));
51 } 51 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698