OLD | NEW |
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> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/atomicops.h" | 10 #include "base/atomicops.h" |
11 #include "base/base_paths.h" | 11 #include "base/base_paths.h" |
12 #include "base/bind.h" | 12 #include "base/bind.h" |
13 #include "base/callback.h" | 13 #include "base/callback.h" |
14 #include "base/command_line.h" | 14 #include "base/command_line.h" |
15 #include "base/compiler_specific.h" | 15 #include "base/compiler_specific.h" |
16 #include "base/file_util.h" | 16 #include "base/file_util.h" |
17 #include "base/files/file_enumerator.h" | 17 #include "base/files/file_enumerator.h" |
18 #include "base/files/file_path.h" | 18 #include "base/files/file_path.h" |
19 #include "base/json/json_file_value_serializer.h" | 19 #include "base/json/json_file_value_serializer.h" |
20 #include "base/logging.h" | 20 #include "base/logging.h" |
21 #include "base/path_service.h" | 21 #include "base/path_service.h" |
22 #include "base/strings/string_util.h" | 22 #include "base/strings/string_util.h" |
23 #include "base/values.h" | 23 #include "base/values.h" |
24 #include "base/version.h" | 24 #include "base/version.h" |
25 #include "base/win/windows_version.h" | 25 #include "base/win/windows_version.h" |
26 #include "build/build_config.h" | 26 #include "build/build_config.h" |
27 #include "chrome/browser/browser_process.h" | 27 #include "chrome/browser/browser_process.h" |
28 #include "chrome/browser/component_updater/component_updater_service.h" | 28 #include "chrome/browser/component_updater/component_updater_service.h" |
29 #include "chrome/browser/omaha_query_params/omaha_query_params.h" | |
30 #include "chrome/common/chrome_paths.h" | 29 #include "chrome/common/chrome_paths.h" |
31 #include "components/nacl/common/nacl_switches.h" | 30 #include "components/nacl/common/nacl_switches.h" |
| 31 #include "components/omaha_query_params/omaha_query_params.h" |
32 #include "content/public/browser/browser_thread.h" | 32 #include "content/public/browser/browser_thread.h" |
33 | 33 |
34 using chrome::OmahaQueryParams; | |
35 using content::BrowserThread; | 34 using content::BrowserThread; |
| 35 using omaha_query_params::OmahaQueryParams; |
36 | 36 |
37 namespace component_updater { | 37 namespace component_updater { |
38 | 38 |
39 namespace { | 39 namespace { |
40 | 40 |
41 // Name of the Pnacl component specified in the manifest. | 41 // Name of the Pnacl component specified in the manifest. |
42 const char kPnaclManifestName[] = "PNaCl Translator"; | 42 const char kPnaclManifestName[] = "PNaCl Translator"; |
43 | 43 |
44 // Sanitize characters from Pnacl Arch value so that they can be used | 44 // Sanitize characters from Pnacl Arch value so that they can be used |
45 // in path names. This should only be characters in the set: [a-z0-9_]. | 45 // in path names. This should only be characters in the set: [a-z0-9_]. |
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
383 } // namespace component_updater | 383 } // namespace component_updater |
384 | 384 |
385 namespace pnacl { | 385 namespace pnacl { |
386 | 386 |
387 bool NeedsOnDemandUpdate() { | 387 bool NeedsOnDemandUpdate() { |
388 return base::subtle::NoBarrier_Load( | 388 return base::subtle::NoBarrier_Load( |
389 &component_updater::needs_on_demand_update) != 0; | 389 &component_updater::needs_on_demand_update) != 0; |
390 } | 390 } |
391 | 391 |
392 } // namespace pnacl | 392 } // namespace pnacl |
OLD | NEW |