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

Unified Diff: components/component_updater/default_component_installer.h

Issue 2483513002: Revert of Makes the component installers return a Result instead of a bool. (Closed)
Patch Set: Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: components/component_updater/default_component_installer.h
diff --git a/components/component_updater/default_component_installer.h b/components/component_updater/default_component_installer.h
index 61e6c56e7670df661e4a40603667a39e2411edb1..18a87c543f8d486ead78178be7c23ab92886d640 100644
--- a/components/component_updater/default_component_installer.h
+++ b/components/component_updater/default_component_installer.h
@@ -58,9 +58,8 @@
// require custom installation operations should implement them here.
// Returns false if a custom operation failed, and true otherwise.
// Called only from a thread belonging to a blocking thread pool.
- virtual update_client::CrxInstaller::Result OnCustomInstall(
- const base::DictionaryValue& manifest,
- const base::FilePath& install_dir) = 0;
+ virtual bool OnCustomInstall(const base::DictionaryValue& manifest,
+ const base::FilePath& install_dir) = 0;
// ComponentReady is called in two cases:
// 1) After an installation is successfully completed.
@@ -116,9 +115,8 @@
// Overridden from ComponentInstaller:
void OnUpdateError(int error) override;
- update_client::CrxInstaller::Result Install(
- const base::DictionaryValue& manifest,
- const base::FilePath& unpack_path) override;
+ bool Install(const base::DictionaryValue& manifest,
+ const base::FilePath& unpack_path) override;
bool GetInstalledFile(const std::string& file,
base::FilePath* installed_file) override;
// Only user-level component installations can be uninstalled.
@@ -132,10 +130,9 @@
// values associated with that installation and returns true; otherwise,
// returns false.
bool FindPreinstallation(const base::FilePath& root);
- update_client::CrxInstaller::Result InstallHelper(
- const base::DictionaryValue& manifest,
- const base::FilePath& unpack_path,
- const base::FilePath& install_path);
+ bool InstallHelper(const base::DictionaryValue& manifest,
+ const base::FilePath& unpack_path,
+ const base::FilePath& install_path);
void StartRegistration(ComponentUpdateService* cus);
void FinishRegistration(ComponentUpdateService* cus,
const base::Closure& callback);

Powered by Google App Engine
This is Rietveld 408576698