diff options
author | jvoung@google.com <jvoung@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 00:39:56 +0000 |
---|---|---|
committer | jvoung@google.com <jvoung@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 00:39:56 +0000 |
commit | 9f108f2f375b79f33bdd0d75ba111530f91da586 (patch) | |
tree | dfca12b4c764f9aa413de82cbb5f07a47150a3df /chrome/browser/chrome_browser_main.cc | |
parent | 41ca8c491a579da650020d435ce1137de8eee17a (diff) | |
download | chromium_src-9f108f2f375b79f33bdd0d75ba111530f91da586.zip chromium_src-9f108f2f375b79f33bdd0d75ba111530f91da586.tar.gz chromium_src-9f108f2f375b79f33bdd0d75ba111530f91da586.tar.bz2 |
Turn on component updater on chromeos, only for the pnacl component.
Make the pnacl component place files in a profile-specific directory
for chromeos. We don't want to share data between users on
chromeos because of questions about integrity of these files.
This adds a notification watcher and will re-register pnacl with
a different version whenever the user logs into
a different account.
Files are installed to a stateful partition, which should
be okay. The stateful partition is mounted no-exec, but
the pnacl files are not typical executables.
This is a temporary solution to help with testing out PNaCl on chromeos.
We will need to find a different solution later that does
not involve multiple copies, one for each user.
BUG=221381
TEST= manual with:
1) export GYP_DEFINES="chromeos=1"
2) build
3) out/Release/chrome --enable-pnacl --enable-nacl --user-data-dir=/tmp/temp_profile_chromeos --login-profile=user --login-manager
4) wait 20 seconds and see /tmp/temp_profile_chromeos/test-user/pnacl/0.0.0.5 show up
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=192415
Review URL: https://codereview.chromium.org/13071002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192969 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main.cc')
-rw-r--r-- | chrome/browser/chrome_browser_main.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index a8abe15..ddf00ea 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -448,11 +448,11 @@ void RecordTouchEventState(const CommandLine& command_line) { void RegisterComponentsForUpdate(const CommandLine& command_line) { ComponentUpdateService* cus = g_browser_process->component_updater(); - if (!cus) - return; - // Registration can be before of after cus->Start() so it is ok to post + + // Registration can be before or after cus->Start() so it is ok to post // a task to the UI thread to do registration once you done the necessary // file IO to know you existing component version. +#if !defined(OS_CHROMEOS) RegisterRecoveryComponent(cus, g_browser_process->local_state()); RegisterPepperFlashComponent(cus); RegisterSwiftShaderComponent(cus); @@ -461,8 +461,10 @@ void RegisterComponentsForUpdate(const CommandLine& command_line) { // network. if (!command_line.HasSwitch(switches::kDisableCRLSets)) g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); +#endif - RegisterPnaclComponent(cus, command_line); + g_browser_process->pnacl_component_installer()->RegisterPnaclComponent( + cus, command_line); cus->Start(); } |