[Web Payments] Initial plumb of Payment Request dialog

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 39 matching lines @@
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/engagement/site_engagement_eviction_policy.h"
 #include "chrome/browser/font_family_cache.h"
 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
 #include "chrome/browser/memory/chrome_memory_coordinator_delegate.h"
 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h"
 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h"
 #include "chrome/browser/notifications/platform_notification_service_impl.h"
 #include "chrome/browser/page_load_metrics/metrics_navigation_throttle.h"
 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
+#include "chrome/browser/payments/payment_request_impl.h"
 #include "chrome/browser/permissions/permission_context_base.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prerender/prerender_final_status.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/prerender/prerender_message_filter.h"
 #include "chrome/browser/printing/printing_message_filter.h"
 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_io_data.h"
@@ skipping 1334 matching lines @@
       switches::kEnableOfflineAutoReloadVisibleOnly)) {
     return true;
   }
   if (browser_command_line.HasSwitch(
       switches::kDisableOfflineAutoReloadVisibleOnly)) {
     return false;
   }
   return true;
 }
 
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)
+bool AreExperimentalWebPlatformFeaturesEnabled() {
+  const base::CommandLine& browser_command_line =
+      *base::CommandLine::ForCurrentProcess();
+  return browser_command_line.HasSwitch(
+      switches::kEnableExperimentalWebPlatformFeatures);
+}
+#endif
+
 void MaybeAppendBlinkSettingsSwitchForFieldTrial(
     const base::CommandLine& browser_command_line,
     base::CommandLine* command_line) {
   // List of field trials that modify the blink-settings command line flag. No
   // two field trials in the list should specify the same keys, otherwise one
   // field trial may overwrite another. See Source/core/frame/Settings.in in
   // Blink for the list of valid keys.
   static const char* const kBlinkSettingsFieldTrials[] = {
       // Keys: backgroundHtmlParserOutstandingTokenLimit
       //       backgroundHtmlParserPendingTokenLimit
@@ skipping 1548 matching lines @@
       content::WebContents::FromRenderFrameHost(render_frame_host);
   if (web_contents) {
     registry->AddInterface(
         web_contents->GetJavaInterfaces()
             ->CreateInterfaceFactory<payments::mojom::PaymentRequest>());
     registry->AddInterface(
         base::Bind(&ForwardShareServiceRequest,
                    web_contents->GetJavaInterfaces()->GetWeakPtr()));
   }
 #endif
-
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)

[Lei Zhang, 2016/11/16 00:59:33]

You can do #elif since this is related to the above block.

[Kevin Bailey, 2016/11/16 14:13:47]

Done.

+  if (AreExperimentalWebPlatformFeaturesEnabled()) {
+    content::WebContents* web_contents =
+        content::WebContents::FromRenderFrameHost(render_frame_host);
+    if (web_contents) {
+      registry->AddInterface(
+          base::Bind(CreatePaymentRequestHandler, web_contents));
+    }
+  }
+#endif

[Lei Zhang, 2016/11/16 00:59:33]

And add a blank line to separate from the unrelated thing below.

[Kevin Bailey, 2016/11/16 14:13:47]

Done.

 #if defined(ENABLE_MEDIA_ROUTER)
   registry->AddInterface(
       base::Bind(&CastRemotingConnector::CreateRemoterFactory,
                  render_frame_host));
 #endif
 }
 
 void ChromeContentBrowserClient::ExposeInterfacesToGpuProcess(
     service_manager::InterfaceRegistry* registry,
     content::GpuProcessHost* render_process_host) {
@@ skipping 245 matching lines @@
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 std::unique_ptr<content::MemoryCoordinatorDelegate>
 ChromeContentBrowserClient::GetMemoryCoordinatorDelegate() {
   return memory::ChromeMemoryCoordinatorDelegate::Create();
 }