chrome/browser/ui/browser_init.cc - Issue 8348026: Add a component installer for Portable NaCl. Registration of installer is

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/ui/browser_init.cc

Issue 8348026: Add a component installer for Portable NaCl. Registration of installer is (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fixes to rebase Created 9 years, 1 month 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

« chrome/browser/component_updater/component_updater_configurator.cc ('K') | « chrome/browser/component_updater/component_updater_configurator.cc ('k') | chrome/common/chrome_paths.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/browser_init.cc

diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc

index 1760d46b30708d76259caa718985b1367d18f4f7..aaa368d465040aa37602ca4ddaf85a173b5c913b 100644

--- a/chrome/browser/ui/browser_init.cc

+++ b/chrome/browser/ui/browser_init.cc

@@ -69,6 +69,7 @@

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

#include "chrome/installer/util/browser_distribution.h"

+#include "chrome/nacl/pnacl_component_installer.h"

#include "content/browser/child_process_security_policy.h"

#include "content/browser/tab_contents/navigation_details.h"

#include "content/browser/tab_contents/tab_contents_view.h"

@@ -544,6 +545,11 @@ void RegisterComponentsForUpdate(const CommandLine& command_line) {

if (command_line.HasSwitch(switches::kEnableCRLSets))

g_browser_process->crl_set_fetcher()->StartInitialLoad(cus);

+ // This developer version of Pnacl should only be installed for developers.

+ if (command_line.HasSwitch(switches::kEnablePnacl)) {

+ RegisterPnaclComponent(cus);

+ }

cus->Start();

}