| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #ifndef CHROME_BROWSER_COMPONENT_UPDATER_PNACL_PNACL_COMPONENT_INSTALLER_H_ | 5 #ifndef CHROME_BROWSER_COMPONENT_UPDATER_PNACL_PNACL_COMPONENT_INSTALLER_H_ |
| 6 #define CHROME_BROWSER_COMPONENT_UPDATER_PNACL_PNACL_COMPONENT_INSTALLER_H_ | 6 #define CHROME_BROWSER_COMPONENT_UPDATER_PNACL_PNACL_COMPONENT_INSTALLER_H_ |
| 7 | 7 |
| 8 #include <list> | 8 #include <list> |
| 9 | 9 |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| 11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
| 12 #include "base/files/file_path.h" | 12 #include "base/files/file_path.h" |
| 13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 14 #include "base/version.h" | 14 #include "base/version.h" |
| 15 #include "chrome/browser/component_updater/component_updater_service.h" | 15 #include "chrome/browser/component_updater/component_updater_service.h" |
| 16 #include "chrome/browser/component_updater/pnacl/pnacl_profile_observer.h" | 16 #include "chrome/browser/component_updater/pnacl/pnacl_profile_observer.h" |
| 17 | 17 |
| 18 namespace base { |
| 18 class CommandLine; | 19 class CommandLine; |
| 19 | |
| 20 namespace base { | |
| 21 class DictionaryValue; | 20 class DictionaryValue; |
| 22 } | 21 } |
| 23 | 22 |
| 24 namespace pnacl { | 23 namespace pnacl { |
| 25 // Returns true if PNaCl actually needs an on-demand component update. | 24 // Returns true if PNaCl actually needs an on-demand component update. |
| 26 // E.g., if PNaCl is not yet installed and the user is loading a PNaCl app, | 25 // E.g., if PNaCl is not yet installed and the user is loading a PNaCl app, |
| 27 // or the current version is behind chrome's version, and is ABI incompatible | 26 // or the current version is behind chrome's version, and is ABI incompatible |
| 28 // with chrome. If not necessary, returns false. | 27 // with chrome. If not necessary, returns false. |
| 29 // May conservatively return false before PNaCl is registered, but | 28 // May conservatively return false before PNaCl is registered, but |
| 30 // should return the right answer after it is registered. | 29 // should return the right answer after it is registered. |
| (...skipping 14 matching lines...) Expand all Loading... |
| 45 virtual void OnUpdateError(int error) OVERRIDE; | 44 virtual void OnUpdateError(int error) OVERRIDE; |
| 46 | 45 |
| 47 virtual bool Install(const base::DictionaryValue& manifest, | 46 virtual bool Install(const base::DictionaryValue& manifest, |
| 48 const base::FilePath& unpack_path) OVERRIDE; | 47 const base::FilePath& unpack_path) OVERRIDE; |
| 49 | 48 |
| 50 virtual bool GetInstalledFile(const std::string& file, | 49 virtual bool GetInstalledFile(const std::string& file, |
| 51 base::FilePath* installed_file) OVERRIDE; | 50 base::FilePath* installed_file) OVERRIDE; |
| 52 | 51 |
| 53 // Register a PNaCl component for the first time. | 52 // Register a PNaCl component for the first time. |
| 54 void RegisterPnaclComponent(ComponentUpdateService* cus, | 53 void RegisterPnaclComponent(ComponentUpdateService* cus, |
| 55 const CommandLine& command_line); | 54 const base::CommandLine& command_line); |
| 56 | 55 |
| 57 // Check the PNaCl version again and re-register with the component | 56 // Check the PNaCl version again and re-register with the component |
| 58 // updater service. | 57 // updater service. |
| 59 void ReRegisterPnacl(); | 58 void ReRegisterPnacl(); |
| 60 | 59 |
| 61 CrxComponent GetCrxComponent(); | 60 CrxComponent GetCrxComponent(); |
| 62 | 61 |
| 63 // Return true if PNaCl installs are separated by user. | 62 // Return true if PNaCl installs are separated by user. |
| 64 bool per_user() const { return per_user_; } | 63 bool per_user() const { return per_user_; } |
| 65 | 64 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 93 base::FilePath current_profile_path_; | 92 base::FilePath current_profile_path_; |
| 94 base::Version current_version_; | 93 base::Version current_version_; |
| 95 std::string current_fingerprint_; | 94 std::string current_fingerprint_; |
| 96 ComponentUpdateService* cus_; | 95 ComponentUpdateService* cus_; |
| 97 DISALLOW_COPY_AND_ASSIGN(PnaclComponentInstaller); | 96 DISALLOW_COPY_AND_ASSIGN(PnaclComponentInstaller); |
| 98 }; | 97 }; |
| 99 | 98 |
| 100 } // namespace component_updater | 99 } // namespace component_updater |
| 101 | 100 |
| 102 #endif // CHROME_BROWSER_COMPONENT_UPDATER_PNACL_PNACL_COMPONENT_INSTALLER_H_ | 101 #endif // CHROME_BROWSER_COMPONENT_UPDATER_PNACL_PNACL_COMPONENT_INSTALLER_H_ |
| OLD | NEW |