chrome/utility/chrome_content_utility_client.cc - Issue 2759283002: Make payment manifest download/parse cross-platform

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/utility/chrome_content_utility_client.cc

Issue 2759283002: Make payment manifest download/parse cross-platform (Closed)

Patch Set: Fix duplicate resource identifier. Created 3 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:

Index: chrome/utility/chrome_content_utility_client.cc

diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc

index 0b8a8d2367df40cb4ae2e5173b27f340c8e217cb..c4e0a9c14cad86c5639f19b3d926df9d00ca1f33 100644

--- a/chrome/utility/chrome_content_utility_client.cc

+++ b/chrome/utility/chrome_content_utility_client.cc

@@ -15,6 +15,7 @@

#include "base/time/time.h"

#include "chrome/common/file_patcher.mojom.h"

#include "chrome/utility/utility_message_handler.h"

+#include "components/payments/content/utility/payment_manifest_parser.h"

#include "components/safe_json/utility/safe_json_parser_mojo_impl.h"

#include "content/public/child/image_decoder_utils.h"

#include "content/public/common/content_switches.h"

@@ -36,8 +37,6 @@

#include "mojo/public/cpp/bindings/strong_binding.h"

#include "net/proxy/mojo_proxy_resolver_factory_impl.h"

#include "net/proxy/proxy_resolver_v8.h"

-#else

-#include "components/payments/content/android/utility/payment_manifest_parser.h"

#endif

#if defined(OS_CHROMEOS)