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

Unified Diff: chrome/browser/chrome_content_browser_client.h

Issue 1831173002: Scaffolding for Android implementation of PaymentRequest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo
Patch Set: Rebase Created 4 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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chrome_content_browser_client.h
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index b500d88e9ee2d229440dfbfa00991c7c773524b6..0142daac7f6194c420d1799523dd13b6122c870a 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -16,6 +16,8 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "build/build_config.h"
+#include "build/buildflag.h"
+#include "chrome/common/features.h"
#include "content/public/browser/content_browser_client.h"
class ChromeContentBrowserClientParts;
@@ -287,6 +289,10 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
const std::string& mime_type) const override;
bool ShouldUseWindowsPrefetchArgument() const override;
#endif
+#if BUILDFLAG(ANDROID_JAVA_UI)
+ void RegisterRenderProcessAndroidMojoServices(
Ted C 2016/03/28 22:46:01 this is an odd api. We should really try to use o
+ content::ServiceRegistryAndroid* registry) override;
+#endif
void RegisterFrameMojoShellServices(
content::ServiceRegistry* registry,
content::RenderFrameHost* render_frame_host) override;

Powered by Google App Engine
This is Rietveld 408576698