chrome/common/chrome_content_client.cc - Issue 392023002: Remove disable-pnacl flag.

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/common/chrome_content_client.cc

Issue 392023002: Remove disable-pnacl flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 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/common/chrome_content_client.cc

diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc

index ca71eac4010c82cd5cc35947f7e389ebc58a302a..5e60faa36528a5c14bb7e64c274799d10480024e 100644

--- a/chrome/common/chrome_content_client.cc

+++ b/chrome/common/chrome_content_client.cc

@@ -181,13 +181,10 @@ void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {

kNaClPluginExtension,

kNaClPluginDescription);

nacl.mime_types.push_back(nacl_mime_type);

- if (!CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kDisablePnacl)) {

- content::WebPluginMimeType pnacl_mime_type(kPnaclPluginMimeType,

- kPnaclPluginExtension,

- kPnaclPluginDescription);

- nacl.mime_types.push_back(pnacl_mime_type);

- }

+ content::WebPluginMimeType pnacl_mime_type(kPnaclPluginMimeType,

+ kPnaclPluginExtension,

+ kPnaclPluginDescription);

+ nacl.mime_types.push_back(pnacl_mime_type);

nacl.permissions = kNaClPluginPermissions;

plugins->push_back(nacl);