chrome/browser/component_updater/pnacl/pnacl_component_installer.cc - Issue 398273002: [NaCl] Build fix for disable_nacl=1

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/browser/component_updater/pnacl/pnacl_component_installer.cc

Issue 398273002: [NaCl] Build fix for disable_nacl=1 (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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/component_updater/pnacl/pnacl_component_installer.cc

diff --git a/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc b/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc

index aadff20516dd55252ea7eeb55b9e43e03165cb2e..ceeb47222363855c733e8c8220f83ddd61bbde1b 100644

--- a/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc

+++ b/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc

@@ -372,8 +372,12 @@ void StartPnaclUpdateRegistration(PnaclComponentInstaller* pci) {

void PnaclComponentInstaller::RegisterPnaclComponent(

ComponentUpdateService* cus,

const CommandLine& command_line) {

+#if defined(DISABLE_NACL)

+ updates_disabled_ = true;

+#else

// Register PNaCl by default (can be disabled).

updates_disabled_ = command_line.HasSwitch(switches::kDisablePnaclInstall);

Lei Zhang 2014/07/17 05:33:47 There's another CL to remove this.

tzik 2014/07/17 05:53:31 Oh, sounds nice. Droped from this CL.

+#endif

cus_ = cus;

BrowserThread::PostTask(BrowserThread::FILE,

FROM_HERE,

« no previous file with comments | « no previous file | chrome/browser/extensions/plugin_manager.cc » ('j') | chrome/browser/extensions/plugin_manager.cc » ('J')