chrome/common/chrome_content_client.cc - Issue 7049012: Cause the 'enable-nacl' flag to be locked with enabling the NaCl plugin.

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 7049012: Cause the 'enable-nacl' flag to be locked with enabling the NaCl plugin. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Use const for "enable-nacl" Created 9 years, 7 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/common/chrome_content_client.cc

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

index ac59d2802cc59f05c8ffe9a558db170725786191..680a661b6ff6bf1348ad51855d54af268288d3e8 100644

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

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

@@ -187,6 +187,7 @@ void AddOutOfProcessFlash(std::vector<PepperPluginInfo>* plugins) {

namespace chrome {

const char* ChromeContentClient::kPDFPluginName = ::kPDFPluginName;

+const char* ChromeContentClient::kNaClPluginName = ::kNaClPluginName;

void ChromeContentClient::SetActiveURL(const GURL& url) {

child_process_logging::SetActiveURL(url);

« no previous file with comments | « chrome/common/chrome_content_client.h ('k') | no next file » | no next file with comments »