Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(270)

Side by Side Diff: chrome/browser/component_updater/pnacl/pnacl_component_installer.cc

Issue 10834348: Have component updater send a "wow64=1" parameter, to be able (Closed)
Patch Set: second try at baseurl... Created 8 years, 4 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/component_updater/component_updater_configurator.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" 5 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 27 matching lines...) Expand all
38 // However, that would make startup detection even slower (need to check for 38 // However, that would make startup detection even slower (need to check for
39 // more than one file!). 39 // more than one file!).
40 const FilePath::CharType kPnaclCompilerFileName[] = 40 const FilePath::CharType kPnaclCompilerFileName[] =
41 FILE_PATH_LITERAL("llc"); 41 FILE_PATH_LITERAL("llc");
42 42
43 // Name of the Pnacl component specified in the manifest. 43 // Name of the Pnacl component specified in the manifest.
44 const char kPnaclManifestName[] = "PNaCl"; 44 const char kPnaclManifestName[] = "PNaCl";
45 45
46 // Name of the Pnacl architecture in the component manifest. 46 // Name of the Pnacl architecture in the component manifest.
47 // NOTE: this is independent of the Omaha query parameter. 47 // NOTE: this is independent of the Omaha query parameter.
48 // TODO(jvoung): Will the Omaha query do the right thing for windows
49 // on x86-64? If it doesn't, will we need two separate Omaha queries (ouch)?
50 const char* PnaclArch() { 48 const char* PnaclArch() {
51 #if defined(ARCH_CPU_X86_FAMILY) 49 #if defined(ARCH_CPU_X86_FAMILY)
52 #if defined(ARCH_CPU_X86_64) 50 #if defined(ARCH_CPU_X86_64)
53 return "x86-64"; 51 return "x86-64";
54 #elif defined(OS_WIN) 52 #elif defined(OS_WIN)
55 bool x86_64 = (base::win::OSInfo::GetInstance()->wow64_status() == 53 bool x86_64 = (base::win::OSInfo::GetInstance()->wow64_status() ==
56 base::win::OSInfo::WOW64_ENABLED); 54 base::win::OSInfo::WOW64_ENABLED);
57 return x86_64 ? "x86-64" : "x86-32"; 55 return x86_64 ? "x86-64" : "x86-32";
58 #else 56 #else
59 return "x86-32"; 57 return "x86-32";
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 } 294 }
297 } 295 }
298 296
299 } // namespace 297 } // namespace
300 298
301 void RegisterPnaclComponent(ComponentUpdateService* cus) { 299 void RegisterPnaclComponent(ComponentUpdateService* cus) {
302 BrowserThread::PostTask( 300 BrowserThread::PostTask(
303 BrowserThread::FILE, FROM_HERE, 301 BrowserThread::FILE, FROM_HERE,
304 base::Bind(&StartPnaclUpdateRegistration, cus)); 302 base::Bind(&StartPnaclUpdateRegistration, cus));
305 } 303 }
OLDNEW
« no previous file with comments | « chrome/browser/component_updater/component_updater_configurator.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698