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

Unified Diff: chrome/browser/component_updater/swiftshader_component_installer.cc

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: chrome/browser/component_updater/swiftshader_component_installer.cc
diff --git a/chrome/browser/component_updater/swiftshader_component_installer.cc b/chrome/browser/component_updater/swiftshader_component_installer.cc
index 9ce9a750719a614124fbffc25fee4ac4b4e113a6..411c8db491b82796258a4058a6e751c31c00690d 100644
--- a/chrome/browser/component_updater/swiftshader_component_installer.cc
+++ b/chrome/browser/component_updater/swiftshader_component_installer.cc
@@ -10,7 +10,6 @@
#include "base/base_paths.h"
#include "base/bind.h"
-#include "base/bind_helpers.h"
#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
@@ -22,7 +21,6 @@
#include "components/component_updater/component_updater_paths.h"
#include "components/component_updater/component_updater_service.h"
#include "components/update_client/update_client.h"
-#include "components/update_client/utils.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/gpu_data_manager.h"
#include "content/public/browser/gpu_data_manager_observer.h"
@@ -106,9 +104,8 @@
// ComponentInstaller implementation:
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;
@@ -117,9 +114,6 @@
private:
~SwiftShaderComponentInstaller() override {}
-
- bool DoInstall(const base::DictionaryValue& manifest,
- const base::FilePath& unpack_path);
base::Version current_version_;
};
@@ -134,15 +128,7 @@
NOTREACHED() << "SwiftShader update error: " << error;
}
-update_client::CrxInstaller::Result SwiftShaderComponentInstaller::Install(
- const base::DictionaryValue& manifest,
- const base::FilePath& unpack_path) {
- return update_client::InstallFunctionWrapper(base::Bind(
- &SwiftShaderComponentInstaller::DoInstall, base::Unretained(this),
- base::ConstRef(manifest), base::ConstRef(unpack_path)));
-}
-
-bool SwiftShaderComponentInstaller::DoInstall(
+bool SwiftShaderComponentInstaller::Install(
const base::DictionaryValue& manifest,
const base::FilePath& unpack_path) {
std::string name;

Powered by Google App Engine
This is Rietveld 408576698