Index: chrome/browser/component_updater/component_patcher_operation.h |
diff --git a/chrome/browser/component_updater/component_patcher_operation.h b/chrome/browser/component_updater/component_patcher_operation.h |
index 6e9fe5be24c3ed0d2938734b559953ddec0d0458..d70dae4b7dcf8c62a27bd07eb4f4d549a1f9eadd 100644 |
--- a/chrome/browser/component_updater/component_patcher_operation.h |
+++ b/chrome/browser/component_updater/component_patcher_operation.h |
@@ -8,11 +8,11 @@ |
#include <string> |
#include "base/basictypes.h" |
#include "base/compiler_specific.h" |
+#include "base/files/file_path.h" |
#include "chrome/browser/component_updater/component_unpacker.h" |
namespace base { |
-class FilePath; |
class DictionaryValue; |
} // namespace base |
@@ -29,7 +29,7 @@ class DeltaUpdateOp { |
// Parses, runs, and verifies the operation, returning an error code if an |
// error is encountered, and DELTA_OK otherwise. In case of errors, |
// extended error information can be returned in the |error| parameter. |
- ComponentUnpacker::Error Run( |
+ component_updater::Error Run( |
base::DictionaryValue* command_args, |
const base::FilePath& input_dir, |
const base::FilePath& unpack_dir, |
@@ -42,12 +42,12 @@ class DeltaUpdateOp { |
base::FilePath output_abs_path_; |
private: |
- ComponentUnpacker::Error CheckHash(); |
+ component_updater::Error CheckHash(); |
// Subclasses must override DoParseArguments to parse operation-specific |
// arguments. DoParseArguments returns DELTA_OK on success; any other code |
// represents failure. |
- virtual ComponentUnpacker::Error DoParseArguments( |
+ virtual component_updater::Error DoParseArguments( |
base::DictionaryValue* command_args, |
const base::FilePath& input_dir, |
ComponentInstaller* installer) = 0; |
@@ -55,7 +55,7 @@ class DeltaUpdateOp { |
// Subclasses must override DoRun to actually perform the patching operation. |
// DoRun returns DELTA_OK on success; any other code represents failure. |
// Additional error information can be returned in the |error| parameter. |
- virtual ComponentUnpacker::Error DoRun(ComponentPatcher* patcher, |
+ virtual component_updater::Error DoRun(ComponentPatcher* patcher, |
int* error) = 0; |
DISALLOW_COPY_AND_ASSIGN(DeltaUpdateOp); |
@@ -70,12 +70,12 @@ class DeltaUpdateOpCopy : public DeltaUpdateOp { |
private: |
// Overrides of DeltaUpdateOp. |
- virtual ComponentUnpacker::Error DoParseArguments( |
+ virtual component_updater::Error DoParseArguments( |
base::DictionaryValue* command_args, |
const base::FilePath& input_dir, |
ComponentInstaller* installer) OVERRIDE; |
- virtual ComponentUnpacker::Error DoRun(ComponentPatcher* patcher, |
+ virtual component_updater::Error DoRun(ComponentPatcher* patcher, |
int* error) OVERRIDE; |
base::FilePath input_abs_path_; |
@@ -93,12 +93,12 @@ class DeltaUpdateOpCreate : public DeltaUpdateOp { |
private: |
// Overrides of DeltaUpdateOp. |
- virtual ComponentUnpacker::Error DoParseArguments( |
+ virtual component_updater::Error DoParseArguments( |
base::DictionaryValue* command_args, |
const base::FilePath& input_dir, |
ComponentInstaller* installer) OVERRIDE; |
- virtual ComponentUnpacker::Error DoRun(ComponentPatcher* patcher, |
+ virtual component_updater::Error DoRun(ComponentPatcher* patcher, |
int* error) OVERRIDE; |
base::FilePath patch_abs_path_; |
@@ -115,12 +115,12 @@ class DeltaUpdateOpPatchBsdiff : public DeltaUpdateOp { |
private: |
// Overrides of DeltaUpdateOp. |
- virtual ComponentUnpacker::Error DoParseArguments( |
+ virtual component_updater::Error DoParseArguments( |
base::DictionaryValue* command_args, |
const base::FilePath& input_dir, |
ComponentInstaller* installer) OVERRIDE; |
- virtual ComponentUnpacker::Error DoRun(ComponentPatcher* patcher, |
+ virtual component_updater::Error DoRun(ComponentPatcher* patcher, |
int* error) OVERRIDE; |
base::FilePath patch_abs_path_; |
@@ -138,12 +138,12 @@ class DeltaUpdateOpPatchCourgette : public DeltaUpdateOp { |
private: |
// Overrides of DeltaUpdateOp. |
- virtual ComponentUnpacker::Error DoParseArguments( |
+ virtual component_updater::Error DoParseArguments( |
base::DictionaryValue* command_args, |
const base::FilePath& input_dir, |
ComponentInstaller* installer) OVERRIDE; |
- virtual ComponentUnpacker::Error DoRun(ComponentPatcher* patcher, |
+ virtual component_updater::Error DoRun(ComponentPatcher* patcher, |
int* error) OVERRIDE; |
base::FilePath patch_abs_path_; |