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 <stdint.h> | 7 #include <stdint.h> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 14 matching lines...) Expand all Loading... |
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/common/chrome_paths.h" | 28 #include "chrome/common/chrome_paths.h" |
29 #include "components/component_updater/component_updater_service.h" | 29 #include "components/component_updater/component_updater_service.h" |
30 #include "components/nacl/common/nacl_switches.h" | 30 #include "components/nacl/common/nacl_switches.h" |
31 #include "components/update_client/update_query_params.h" | 31 #include "components/update_client/update_query_params.h" |
32 #include "content/public/browser/browser_thread.h" | 32 #include "content/public/browser/browser_thread.h" |
33 | 33 |
34 using content::BrowserThread; | 34 using content::BrowserThread; |
| 35 using update_client::CrxComponent; |
35 using update_client::UpdateQueryParams; | 36 using update_client::UpdateQueryParams; |
36 | 37 |
37 namespace component_updater { | 38 namespace component_updater { |
38 | 39 |
39 namespace { | 40 namespace { |
40 | 41 |
41 // Name of the Pnacl component specified in the manifest. | 42 // Name of the Pnacl component specified in the manifest. |
42 const char kPnaclManifestName[] = "PNaCl Translator"; | 43 const char kPnaclManifestName[] = "PNaCl Translator"; |
43 | 44 |
44 // Sanitize characters from Pnacl Arch value so that they can be used | 45 // Sanitize characters from Pnacl Arch value so that they can be used |
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
372 } // namespace component_updater | 373 } // namespace component_updater |
373 | 374 |
374 namespace pnacl { | 375 namespace pnacl { |
375 | 376 |
376 bool NeedsOnDemandUpdate() { | 377 bool NeedsOnDemandUpdate() { |
377 return base::subtle::NoBarrier_Load( | 378 return base::subtle::NoBarrier_Load( |
378 &component_updater::needs_on_demand_update) != 0; | 379 &component_updater::needs_on_demand_update) != 0; |
379 } | 380 } |
380 | 381 |
381 } // namespace pnacl | 382 } // namespace pnacl |
OLD | NEW |