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

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

Issue 2851173004: Eliminate bind callback that doesn't take a BindSourceInfo parameter. (Closed)
Patch Set: . Created 3 years, 7 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 867 matching lines...) Expand 10 before | Expand all | Expand 10 after
878 } 878 }
879 } 879 }
880 // The forbidden app URL was being opened by a different app or extension. 880 // The forbidden app URL was being opened by a different app or extension.
881 return APP_LOADED_IN_TAB_SOURCE_OTHER_EXTENSION; 881 return APP_LOADED_IN_TAB_SOURCE_OTHER_EXTENSION;
882 } 882 }
883 // The forbidden app URL was being opened by a non-extension page (e.g. http). 883 // The forbidden app URL was being opened by a non-extension page (e.g. http).
884 return APP_LOADED_IN_TAB_SOURCE_OTHER; 884 return APP_LOADED_IN_TAB_SOURCE_OTHER;
885 } 885 }
886 #endif // BUILDFLAG(ENABLE_EXTENSIONS) 886 #endif // BUILDFLAG(ENABLE_EXTENSIONS)
887 887
888 void CreateUsbDeviceManager( 888 void CreateUsbDeviceManager(RenderFrameHost* render_frame_host,
889 RenderFrameHost* render_frame_host, 889 const service_manager::BindSourceInfo& source_info,
890 mojo::InterfaceRequest<device::mojom::UsbDeviceManager> request) { 890 device::mojom::UsbDeviceManagerRequest request) {
891 WebContents* web_contents = 891 WebContents* web_contents =
892 WebContents::FromRenderFrameHost(render_frame_host); 892 WebContents::FromRenderFrameHost(render_frame_host);
893 if (!web_contents) { 893 if (!web_contents) {
894 NOTREACHED(); 894 NOTREACHED();
895 return; 895 return;
896 } 896 }
897 897
898 UsbTabHelper* tab_helper = 898 UsbTabHelper* tab_helper =
899 UsbTabHelper::GetOrCreateForWebContents(web_contents); 899 UsbTabHelper::GetOrCreateForWebContents(web_contents);
900 tab_helper->CreateDeviceManager(render_frame_host, std::move(request)); 900 tab_helper->CreateDeviceManager(render_frame_host, std::move(request));
901 } 901 }
902 902
903 void CreateWebUsbChooserService( 903 void CreateWebUsbChooserService(
904 RenderFrameHost* render_frame_host, 904 RenderFrameHost* render_frame_host,
905 mojo::InterfaceRequest<device::mojom::UsbChooserService> request) { 905 const service_manager::BindSourceInfo& source_info,
906 device::mojom::UsbChooserServiceRequest request) {
906 WebContents* web_contents = 907 WebContents* web_contents =
907 WebContents::FromRenderFrameHost(render_frame_host); 908 WebContents::FromRenderFrameHost(render_frame_host);
908 if (!web_contents) { 909 if (!web_contents) {
909 NOTREACHED(); 910 NOTREACHED();
910 return; 911 return;
911 } 912 }
912 913
913 UsbTabHelper* tab_helper = 914 UsbTabHelper* tab_helper =
914 UsbTabHelper::GetOrCreateForWebContents(web_contents); 915 UsbTabHelper::GetOrCreateForWebContents(web_contents);
915 tab_helper->CreateChooserService(render_frame_host, std::move(request)); 916 tab_helper->CreateChooserService(render_frame_host, std::move(request));
(...skipping 752 matching lines...) Expand 10 before | Expand all | Expand 10 after
1668 return; 1669 return;
1669 } 1670 }
1670 1671
1671 command_line->AppendSwitchASCII(switches::kBlinkSettings, 1672 command_line->AppendSwitchASCII(switches::kBlinkSettings,
1672 base::JoinString(blink_settings, ",")); 1673 base::JoinString(blink_settings, ","));
1673 } 1674 }
1674 1675
1675 #if defined(OS_ANDROID) 1676 #if defined(OS_ANDROID)
1676 void ForwardInstalledAppProviderRequest( 1677 void ForwardInstalledAppProviderRequest(
1677 base::WeakPtr<service_manager::InterfaceProvider> interface_provider, 1678 base::WeakPtr<service_manager::InterfaceProvider> interface_provider,
1679 const service_manager::BindSourceInfo& source_info,
1678 blink::mojom::InstalledAppProviderRequest request) { 1680 blink::mojom::InstalledAppProviderRequest request) {
1679 if (!interface_provider || 1681 if (!interface_provider ||
1680 ChromeOriginTrialPolicy().IsFeatureDisabled("InstalledApp")) { 1682 ChromeOriginTrialPolicy().IsFeatureDisabled("InstalledApp")) {
1681 return; 1683 return;
1682 } 1684 }
1683 interface_provider->GetInterface(std::move(request)); 1685 interface_provider->GetInterface(std::move(request));
1684 } 1686 }
1685 1687
1686 void ForwardShareServiceRequest( 1688 void ForwardShareServiceRequest(
1687 base::WeakPtr<service_manager::InterfaceProvider> interface_provider, 1689 base::WeakPtr<service_manager::InterfaceProvider> interface_provider,
1690 const service_manager::BindSourceInfo& source_info,
1688 blink::mojom::ShareServiceRequest request) { 1691 blink::mojom::ShareServiceRequest request) {
1689 if (!interface_provider || 1692 if (!interface_provider ||
1690 ChromeOriginTrialPolicy().IsFeatureDisabled("WebShare")) { 1693 ChromeOriginTrialPolicy().IsFeatureDisabled("WebShare")) {
1691 return; 1694 return;
1692 } 1695 }
1693 interface_provider->GetInterface(std::move(request)); 1696 interface_provider->GetInterface(std::move(request));
1694 } 1697 }
1695 #endif 1698 #endif
1696 1699
1697 } // namespace 1700 } // namespace
(...skipping 1910 matching lines...) Expand 10 before | Expand all | Expand 10 after
3608 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { 3611 RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
3609 return variations::GetVariationParamValue( 3612 return variations::GetVariationParamValue(
3610 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; 3613 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
3611 } 3614 }
3612 3615
3613 // static 3616 // static
3614 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( 3617 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
3615 const storage::QuotaSettings* settings) { 3618 const storage::QuotaSettings* settings) {
3616 g_default_quota_settings = settings; 3619 g_default_quota_settings = settings;
3617 } 3620 }
OLDNEW
« no previous file with comments | « chrome/browser/budget_service/budget_service_impl.cc ('k') | chrome/browser/chromeos/attestation/platform_verification_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698