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

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

Issue 2799393003: Add a browser-side kill switch to getInstalledRelatedApps. (Closed)
Patch Set: Created 3 years, 8 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1647 matching lines...) Expand 10 before | Expand all | Expand 10 after
1658 LOG(WARNING) << "Received field trial params, " 1658 LOG(WARNING) << "Received field trial params, "
1659 "but blink-settings switch already specified."; 1659 "but blink-settings switch already specified.";
1660 return; 1660 return;
1661 } 1661 }
1662 1662
1663 command_line->AppendSwitchASCII(switches::kBlinkSettings, 1663 command_line->AppendSwitchASCII(switches::kBlinkSettings,
1664 base::JoinString(blink_settings, ",")); 1664 base::JoinString(blink_settings, ","));
1665 } 1665 }
1666 1666
1667 #if defined(OS_ANDROID) 1667 #if defined(OS_ANDROID)
1668 void ForwardInstalledAppProviderRequest(
1669 base::WeakPtr<service_manager::InterfaceProvider> interface_provider,
1670 blink::mojom::InstalledAppProviderRequest request) {
1671 if (!interface_provider ||
1672 ChromeOriginTrialPolicy().IsFeatureDisabled("InstalledApp")) {
1673 return;
1674 }
1675 interface_provider->GetInterface(std::move(request));
1676 }
1677
1668 void ForwardShareServiceRequest( 1678 void ForwardShareServiceRequest(
1669 base::WeakPtr<service_manager::InterfaceProvider> interface_provider, 1679 base::WeakPtr<service_manager::InterfaceProvider> interface_provider,
1670 blink::mojom::ShareServiceRequest request) { 1680 blink::mojom::ShareServiceRequest request) {
1671 if (!interface_provider || 1681 if (!interface_provider ||
1672 ChromeOriginTrialPolicy().IsFeatureDisabled("WebShare")) { 1682 ChromeOriginTrialPolicy().IsFeatureDisabled("WebShare")) {
1673 return; 1683 return;
1674 } 1684 }
1675 interface_provider->GetInterface(std::move(request)); 1685 interface_provider->GetInterface(std::move(request));
1676 } 1686 }
1677 #endif 1687 #endif
(...skipping 1507 matching lines...) Expand 10 before | Expand all | Expand 10 after
3185 registry->AddInterface( 3195 registry->AddInterface(
3186 base::Bind(&password_manager::ContentPasswordManagerDriverFactory:: 3196 base::Bind(&password_manager::ContentPasswordManagerDriverFactory::
3187 BindSensitiveInputVisibilityService, 3197 BindSensitiveInputVisibilityService,
3188 render_frame_host)); 3198 render_frame_host));
3189 3199
3190 #if defined(OS_ANDROID) 3200 #if defined(OS_ANDROID)
3191 registry->AddInterface( 3201 registry->AddInterface(
3192 render_frame_host->GetJavaInterfaces() 3202 render_frame_host->GetJavaInterfaces()
3193 ->CreateInterfaceFactory<payments::mojom::PaymentRequest>()); 3203 ->CreateInterfaceFactory<payments::mojom::PaymentRequest>());
3194 registry->AddInterface( 3204 registry->AddInterface(
3195 render_frame_host->GetJavaInterfaces() 3205 base::Bind(&ForwardInstalledAppProviderRequest,
3196 ->CreateInterfaceFactory<blink::mojom::InstalledAppProvider>()); 3206 render_frame_host->GetJavaInterfaces()->GetWeakPtr()));
3197 content::WebContents* web_contents = 3207 content::WebContents* web_contents =
3198 content::WebContents::FromRenderFrameHost(render_frame_host); 3208 content::WebContents::FromRenderFrameHost(render_frame_host);
3199 if (web_contents) { 3209 if (web_contents) {
3200 registry->AddInterface( 3210 registry->AddInterface(
3201 base::Bind(&ForwardShareServiceRequest, 3211 base::Bind(&ForwardShareServiceRequest,
3202 web_contents->GetJavaInterfaces()->GetWeakPtr())); 3212 web_contents->GetJavaInterfaces()->GetWeakPtr()));
3203 } 3213 }
3204 #else 3214 #else
3205 if (AreExperimentalWebPlatformFeaturesEnabled() && 3215 if (AreExperimentalWebPlatformFeaturesEnabled() &&
3206 base::FeatureList::IsEnabled(features::kWebPayments)) { 3216 base::FeatureList::IsEnabled(features::kWebPayments)) {
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after
3608 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { 3618 RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
3609 return variations::GetVariationParamValue( 3619 return variations::GetVariationParamValue(
3610 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; 3620 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
3611 } 3621 }
3612 3622
3613 // static 3623 // static
3614 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( 3624 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
3615 const storage::QuotaSettings* settings) { 3625 const storage::QuotaSettings* settings) {
3616 g_default_quota_settings = settings; 3626 g_default_quota_settings = settings;
3617 } 3627 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698