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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2687033004: [WebPayments] Enabling PaymentRequest on Mac (Closed)
Patch Set: grouping deps with sources Created 3 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/BUILD.gn ('k') | chrome/browser/ui/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index d1a18640e8a7e9d2731e9fa0f26671a691506f92..daa54e445a3dfe1f68f68ad34d102e15e42875fb 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -249,7 +249,7 @@
#include "chrome/browser/chrome_browser_main_posix.h"
#endif
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)
+#if !defined(OS_ANDROID)
#include "chrome/browser/payments/payment_request_factory.h"
#endif
@@ -1481,7 +1481,7 @@ bool IsAutoReloadVisibleOnlyEnabled() {
return true;
}
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)
+#if !defined(OS_ANDROID)
bool AreExperimentalWebPlatformFeaturesEnabled() {
const base::CommandLine& browser_command_line =
*base::CommandLine::ForCurrentProcess();
@@ -3070,8 +3070,7 @@ void ChromeContentBrowserClient::RegisterRenderFrameMojoInterfaces(
base::Bind(&ForwardShareServiceRequest,
web_contents->GetJavaInterfaces()->GetWeakPtr()));
}
-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)
- // TODO(crbug.com/679127): Enable for MacViews implementation.
+#else
if (AreExperimentalWebPlatformFeaturesEnabled()) {
content::WebContents* web_contents =
content::WebContents::FromRenderFrameHost(render_frame_host);
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/ui/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698