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

Unified Diff: chrome/renderer/chrome_content_renderer_client.h

Issue 673663004: Android: Do not build any extensions code except for extensions_constants. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@zoom_controller
Patch Set: fix merge conflict Created 6 years, 2 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/common/BUILD.gn ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_content_renderer_client.h
diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h
index c5590c024b672ac2eb0792b0619ca217e4e277b3..9c3ac3adfc3111600e50219c2c3d16c6230b6c32 100644
--- a/chrome/renderer/chrome_content_renderer_client.h
+++ b/chrome/renderer/chrome_content_renderer_client.h
@@ -191,6 +191,7 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
static GURL GetNaClContentHandlerURL(const std::string& actual_mime_type,
const content::WebPluginInfo& plugin);
+#if !defined(DISABLE_NACL)
// Determines if a NaCl app is allowed, and modifies params to pass the app's
// permissions to the trusted NaCl plugin.
static bool IsNaClAllowed(const GURL& manifest_url,
@@ -198,6 +199,7 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
bool is_nacl_unrestricted,
const extensions::Extension* extension,
blink::WebPluginParams* params);
+#endif
scoped_ptr<ChromeRenderProcessObserver> chrome_observer_;
scoped_ptr<web_cache::WebCacheRenderProcessObserver> web_cache_observer_;
« no previous file with comments | « chrome/common/BUILD.gn ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698