diff options
| author | wfh <wfh@chromium.org> | 2015-07-20 11:04:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-20 18:05:31 +0000 |
| commit | 6be0628ff61f6ffd12d686caddb8c522e10824a9 (patch) | |
| tree | 391d1aa17b50afa89ad240844a4a3de6a28e9123 /content/public/browser | |
| parent | a8e9b5955fa9196b7dc5c764d0e418ae4ef89f39 (diff) | |
| download | chromium_src-6be0628ff61f6ffd12d686caddb8c522e10824a9.zip chromium_src-6be0628ff61f6ffd12d686caddb8c522e10824a9.tar.gz chromium_src-6be0628ff61f6ffd12d686caddb8c522e10824a9.tar.bz2 | |
Remove NPAPI command line flags entirely.
ContentShell now overrides IsNpapiEnabled() to enable NPAPI for testing.
BUG=493212
CQ_INCLUDE_TRYBOTS=tryserver.blink:win_blink_rel,mac_blink_rel
Review URL: https://codereview.chromium.org/1240543003
Cr-Commit-Position: refs/heads/master@{#339469}
Diffstat (limited to 'content/public/browser')
| -rw-r--r-- | content/public/browser/content_browser_client.cc | 4 | ||||
| -rw-r--r-- | content/public/browser/content_browser_client.h | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc index aaa9bc0..dae2d4f3 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc @@ -307,6 +307,10 @@ TracingDelegate* ContentBrowserClient::GetTracingDelegate() { return nullptr; } +bool ContentBrowserClient::IsNPAPIEnabled() { + return false; +} + bool ContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle( BrowserContext* browser_context, const GURL& url) { diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h index a4279f8..ff2beaa 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -562,6 +562,9 @@ class CONTENT_EXPORT ContentBrowserClient { // It's valid to return nullptr. virtual TracingDelegate* GetTracingDelegate(); + // Returns true if NPAPI plugins are enabled. + virtual bool IsNPAPIEnabled(); + // Returns true if plugin referred to by the url can use // pp::FileIO::RequestOSFileHandle. virtual bool IsPluginAllowedToCallRequestOSFileHandle( |