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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 1742753002: Rename web_usb_permission_bubble.cc/h and webusb_permission_bubble.mojom (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updated usb_chooser_bubble_controller.cc/h Created 4 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 #if defined(ENABLE_WEBRTC) 285 #if defined(ENABLE_WEBRTC)
286 #include "chrome/browser/media/webrtc_logging_handler_host.h" 286 #include "chrome/browser/media/webrtc_logging_handler_host.h"
287 #endif 287 #endif
288 288
289 #if defined(ENABLE_MEDIA_ROUTER) 289 #if defined(ENABLE_MEDIA_ROUTER)
290 #include "chrome/browser/media/router/media_router_feature.h" 290 #include "chrome/browser/media/router/media_router_feature.h"
291 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" 291 #include "chrome/browser/media/router/presentation_service_delegate_impl.h"
292 #endif 292 #endif
293 293
294 #if !defined(OS_ANDROID) 294 #if !defined(OS_ANDROID)
295 #include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h" 295 #include "device/usb/public/interfaces/chooser_service.mojom.h"
296 #endif 296 #endif
297 297
298 #if defined(ENABLE_WAYLAND_SERVER) 298 #if defined(ENABLE_WAYLAND_SERVER)
299 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" 299 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h"
300 #endif 300 #endif
301 301
302 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) 302 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
303 #include "media/mojo/services/mojo_media_application_factory.h" 303 #include "media/mojo/services/mojo_media_application_factory.h"
304 #endif 304 #endif
305 305
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 NOTREACHED(); 675 NOTREACHED();
676 return; 676 return;
677 } 677 }
678 678
679 UsbTabHelper* tab_helper = 679 UsbTabHelper* tab_helper =
680 UsbTabHelper::GetOrCreateForWebContents(web_contents); 680 UsbTabHelper::GetOrCreateForWebContents(web_contents);
681 tab_helper->CreateDeviceManager(render_frame_host, std::move(request)); 681 tab_helper->CreateDeviceManager(render_frame_host, std::move(request));
682 } 682 }
683 683
684 #if !defined(OS_ANDROID) 684 #if !defined(OS_ANDROID)
685 void CreateWebUsbPermissionBubble( 685 void CreateWebUsbChooserService(
686 RenderFrameHost* render_frame_host, 686 RenderFrameHost* render_frame_host,
687 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) { 687 mojo::InterfaceRequest<device::ChooserService> request) {
688 WebContents* web_contents = 688 WebContents* web_contents =
689 WebContents::FromRenderFrameHost(render_frame_host); 689 WebContents::FromRenderFrameHost(render_frame_host);
690 if (!web_contents) { 690 if (!web_contents) {
691 NOTREACHED(); 691 NOTREACHED();
692 return; 692 return;
693 } 693 }
694 694
695 UsbTabHelper* tab_helper = 695 UsbTabHelper* tab_helper =
696 UsbTabHelper::GetOrCreateForWebContents(web_contents); 696 UsbTabHelper::GetOrCreateForWebContents(web_contents);
697 tab_helper->CreatePermissionBubble(render_frame_host, std::move(request)); 697 tab_helper->CreateChooserService(render_frame_host, std::move(request));
698 } 698 }
699 #endif // !defined(OS_ANDROID) 699 #endif // !defined(OS_ANDROID)
700 700
701 bool GetDataSaverEnabledPref(const PrefService* prefs) { 701 bool GetDataSaverEnabledPref(const PrefService* prefs) {
702 // Enable data saver only when data saver pref is enabled and not part of 702 // Enable data saver only when data saver pref is enabled and not part of
703 // "Disabled" group of "SaveDataHeader" experiment. 703 // "Disabled" group of "SaveDataHeader" experiment.
704 return prefs->GetBoolean(prefs::kDataSaverEnabled) && 704 return prefs->GetBoolean(prefs::kDataSaverEnabled) &&
705 base::FieldTrialList::FindFullName("SaveDataHeader") 705 base::FieldTrialList::FindFullName("SaveDataHeader")
706 .compare("Disabled"); 706 .compare("Disabled");
707 } 707 }
(...skipping 2051 matching lines...) Expand 10 before | Expand all | Expand 10 after
2759 render_frame_host)); 2759 render_frame_host));
2760 #endif 2760 #endif
2761 } 2761 }
2762 2762
2763 void ChromeContentBrowserClient::RegisterRenderFrameMojoServices( 2763 void ChromeContentBrowserClient::RegisterRenderFrameMojoServices(
2764 content::ServiceRegistry* registry, 2764 content::ServiceRegistry* registry,
2765 content::RenderFrameHost* render_frame_host) { 2765 content::RenderFrameHost* render_frame_host) {
2766 registry->AddService(base::Bind(&CreateUsbDeviceManager, render_frame_host)); 2766 registry->AddService(base::Bind(&CreateUsbDeviceManager, render_frame_host));
2767 #if !defined(OS_ANDROID) 2767 #if !defined(OS_ANDROID)
2768 registry->AddService( 2768 registry->AddService(
2769 base::Bind(&CreateWebUsbPermissionBubble, render_frame_host)); 2769 base::Bind(&CreateWebUsbChooserService, render_frame_host));
2770 #endif // !defined(OS_ANDROID) 2770 #endif // !defined(OS_ANDROID)
2771 } 2771 }
2772 2772
2773 void ChromeContentBrowserClient::RegisterInProcessMojoApplications( 2773 void ChromeContentBrowserClient::RegisterInProcessMojoApplications(
2774 StaticMojoApplicationMap* apps) { 2774 StaticMojoApplicationMap* apps) {
2775 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) 2775 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
2776 apps->insert(std::make_pair(GURL("mojo:media"), 2776 apps->insert(std::make_pair(GURL("mojo:media"),
2777 base::Bind(&media::CreateMojoMediaApplication))); 2777 base::Bind(&media::CreateMojoMediaApplication)));
2778 #endif 2778 #endif
2779 } 2779 }
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
2942 if (channel <= kMaxDisableEncryptionChannel) { 2942 if (channel <= kMaxDisableEncryptionChannel) {
2943 static const char* const kWebRtcDevSwitchNames[] = { 2943 static const char* const kWebRtcDevSwitchNames[] = {
2944 switches::kDisableWebRtcEncryption, 2944 switches::kDisableWebRtcEncryption,
2945 }; 2945 };
2946 to_command_line->CopySwitchesFrom(from_command_line, 2946 to_command_line->CopySwitchesFrom(from_command_line,
2947 kWebRtcDevSwitchNames, 2947 kWebRtcDevSwitchNames,
2948 arraysize(kWebRtcDevSwitchNames)); 2948 arraysize(kWebRtcDevSwitchNames));
2949 } 2949 }
2950 } 2950 }
2951 #endif // defined(ENABLE_WEBRTC) 2951 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/usb/usb_chooser_bubble_controller.h » ('j') | components/webusb/public/interfaces/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698